Skip to content

Commit

Permalink
Merge pull request #1719 from wielebenwir/release/2.10
Browse files Browse the repository at this point in the history
Release/2.10
  • Loading branch information
hansmorb authored Jan 9, 2025
2 parents 6e9302d + 06fa30a commit a78e074
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 82 deletions.
3 changes: 2 additions & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ phpunit
project.json
README.md
tsconfig.*
webpack.config.js
webpack.config.js
phpstan.neon
6 changes: 3 additions & 3 deletions commonsbooking.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* Plugin Name: Commons Booking
* Version: 2.9.4
* Version: 2.10
* Requires at least: 5.2
* Requires PHP: 7.4
* Plugin URI: https://commonsbooking.org
Expand All @@ -18,8 +18,8 @@
use CommonsBooking\Plugin;

defined('ABSPATH') or die("Thanks for visiting");
define('COMMONSBOOKING_VERSION', '2.9.4');
define('COMMONSBOOKING_VERSION_COMMENT', 'master'); // Empty for release - Used to mark development versions
define('COMMONSBOOKING_VERSION', '2.10');
define('COMMONSBOOKING_VERSION_COMMENT', ''); // Empty for release - Used to mark development versions
define('COMMONSBOOKING_PLUGIN_SLUG', 'commonsbooking');
define('COMMONSBOOKING_MENU_SLUG', COMMONSBOOKING_PLUGIN_SLUG . '-menu');
define('COMMONSBOOKING_PLUGIN_DIR', wp_normalize_path( plugin_dir_path(__FILE__)));
Expand Down
Binary file modified languages/commonsbooking-de_DE.mo
Binary file not shown.
45 changes: 26 additions & 19 deletions languages/commonsbooking-de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/commonsbooking\n"
"POT-Creation-Date: 2023-09-15T04:04:14+02:00\n"
"PO-Revision-Date: 2024-12-12 16:01+0100\n"
"PO-Revision-Date: 2025-01-06 18:35+0100\n"
"Last-Translator: Christian Wenzel <[email protected]>\n"
"Language-Team: English <[email protected]>\n"
"Language: de_DE\n"
Expand Down Expand Up @@ -850,7 +850,7 @@ msgstr "Buchungen auf neue Version migrieren"
msgid "Migrate bookings to new format so that they are listed at bookings menu item. <br><strong>This function is only for special cases during migration. Please use it only in case of problems with migration.</strong>"
msgstr "Migriere Buchungen in ein neues Format, sodass diese unter dem Menüpunkt Buchungen aufgelistet werden. <br><strong>Diese Funktion gilt nur für Sonderfälle während der Migration. Bitte nur bei Problemen währen der Migration verwenden. </strong>"

#: includes/OptionsArray.php:1125 src/View/MassOperations.php:110
#: includes/OptionsArray.php:1125 src/View/MassOperations.php:109
#: src/View/Migration.php:107
msgid "Migrate bookings"
msgstr "Buchungen migrieren"
Expand Down Expand Up @@ -1401,14 +1401,14 @@ msgstr "iCalendar Link:"
msgid "Not available"
msgstr "Nicht verfügbar"

#: src/View/Booking.php:193 src/View/MassOperations.php:39
#: src/View/Booking.php:193 src/View/MassOperations.php:38
#: src/Wordpress/CustomPostType/Booking.php:441
#: src/Wordpress/CustomPostType/Timeframe.php:99
#: templates/shortcode-bookings.php:73
msgid "User"
msgstr "Nutzende*r"

#: src/View/Booking.php:197 src/View/MassOperations.php:43
#: src/View/Booking.php:197 src/View/MassOperations.php:42
#: src/Wordpress/CustomPostType/Booking.php:959
#: src/Wordpress/CustomPostType/Restriction.php:472
msgid "Status"
Expand Down Expand Up @@ -1525,7 +1525,7 @@ msgstr " Optionen aktualisiert / gespeichert"
msgid "migration in process .. please wait ... <br>This could take several minutes. Do not close this browser tab"
msgstr "Migration wird durchgeführt .. Bitte warten... <br>Dies kann einige Minuten dauern. Browserfenster bitte nicht schließen"

#: src/View/MassOperations.php:100 src/View/Migration.php:53
#: src/View/MassOperations.php:99 src/View/Migration.php:53
#: src/View/Migration.php:98
msgid "Migration finished"
msgstr "Migration beendet"
Expand All @@ -1538,11 +1538,11 @@ msgstr "Abrufen von Standort-Geokoordinaten."
msgid "If this option is enabled, CommonsBooking will try to derive the matching geo-coordinates from the address data of the locations during import. We use an interface to a GeoCoder service (Nominatim) for this task. This service allows only one query per second, so the runtime of the migration is increased by 1 second per location. The geo-coordinates are needed to use the location map integrated in CommonsBooking."
msgstr "Wenn diese Option aktiviert ist, versucht CommonsBooking beim Import die passenden Geo-Koordinaten aus den Adressdaten der Standorte abzuleiten. Für diese Aufgabe verwenden wir eine Schnittstelle zu einem GeoCoder-Dienst (Nominatim). Dieser Dienst erlaubt nur eine Abfrage pro Sekunde, so dass sich die Laufzeit der Migration um 1 Sekunde pro Standort erhöht. Die Geokoordinaten werden benötigt, um die in CommonsBooking integrierte Standortkarte zu nutzen."

#: src/View/MassOperations.php:95 src/View/Migration.php:93
#: src/View/MassOperations.php:94 src/View/Migration.php:93
msgid "migration in process .. please wait ..."
msgstr "Migration wird durchgeführt … bitte warten ..."

#: src/View/MassOperations.php:105 src/View/Migration.php:103
#: src/View/MassOperations.php:104 src/View/Migration.php:103
msgid "Migration failed"
msgstr "Migration fehlgeschlagen"

Expand All @@ -1562,7 +1562,7 @@ msgstr "CSV Herunterladen"
msgid "Download Export"
msgstr "Download Export"

#: src/Model/Booking.php:1027 src/Service/TimeframeExport.php:523
#: src/Model/Booking.php:1028 src/Service/TimeframeExport.php:523
#: src/Service/TimeframeExport.php:533 src/Service/TimeframeExport.php:539
#: src/Service/TimeframeExport.php:549 src/Service/TimeframeExport.php:559
msgid "Unknown"
Expand Down Expand Up @@ -2258,7 +2258,7 @@ msgstr "Benachrichtigungs-E-Mails an Nutzende senden"

#: src/Wordpress/CustomPostType/Restriction.php:486
msgid "Important: Please save this restriction before clicking the send-button. Dependent of the status of the restriction, the appropriate notifications are sent to all affected users and location admins. You can configure the e-mail templates via Options -> Commonsbooking -> Tab Restrictions"
msgstr "Wichtig: Bitte speicher diese Einschränkung, bevor du auf den Senden-Button klickst. Abhängig vom Status der Einschränkung werden die entsprechenden Benachrichtigungen an alle betroffenen Nutzenden und Standortadministratrierende gesendet. Du kannst die E-Mail-Vorlagen über Optionen -> Commonsbooking -> Tab-Einschränkungen konfigurieren"
msgstr "Wichtig: Bitte speichere diese Einschränkung, bevor du auf den Senden-Button klickst. Abhängig vom Status der Einschränkung werden die entsprechenden Benachrichtigungen an alle betroffenen Nutzenden und Standortadministrierenden gesendet. Du kannst die E-Mail-Vorlagen über Optionen -> CommonsBooking -> Einschränkungen konfigurieren"

#: src/Wordpress/CustomPostType/Restriction.php:504
msgid "Total breakdown"
Expand Down Expand Up @@ -3138,7 +3138,7 @@ msgstr "Buchungen sind auf maximal %1$s Tage im Voraus beschränkt."
msgid "It is not possible to access this timeframe on frontend. Please edit timeframe in backend. If you want to check the result of your timeframe settings visit the item or location in frontend to see the booking calender"
msgstr "Es ist nicht möglich, diesen Zeitrahmen im Frontend abzurufen. Bitte bearbeite den Zeitrahmen im Backend. Wenn du das Ergebnis deiner Zeitrahmeneinstellungen überprüfen möchtest, rufe den Artikel oder Standort im Frontend auf, um den Buchungskalender zu sehen"

#: src/Model/Booking.php:1025
#: src/Model/Booking.php:1026
msgid "Cancelled"
msgstr "Storniert"

Expand Down Expand Up @@ -4084,27 +4084,27 @@ msgstr "Keine Buchungen zum Umzug ausgewählt."
msgid "All selected orphaned bookings have been migrated."
msgstr "Alle ausgewählten verwaisten Buchungen sind migriert worden."

#: src/View/MassOperations.php:38
#: src/View/MassOperations.php:37
msgid "ID"
msgstr "ID"

#: src/View/MassOperations.php:40
#: src/View/MassOperations.php:39
msgid "Item name"
msgstr "Artikelname"

#: src/View/MassOperations.php:41
#: src/View/MassOperations.php:40
msgid "Start-date"
msgstr "Startdatum"

#: src/View/MassOperations.php:42
#: src/View/MassOperations.php:41
msgid "End-date"
msgstr "Enddatum"

#: src/View/MassOperations.php:44
#: src/View/MassOperations.php:43
msgid "Location name"
msgstr "Standortname"

#: src/View/MassOperations.php:45
#: src/View/MassOperations.php:44
msgid "New location name"
msgstr "Name des neuen Standorts"

Expand All @@ -4116,8 +4116,7 @@ msgstr "Verwaiste Buchungen gefunden, können migriert werden. <a href=\"admin.p
msgid "Migrate orphaned bookings"
msgstr "Verwaiste Buchungen migrieren"

#: src/Service/MassOperations.php:64
#: src/Service/MassOperations.php:67
#: src/Service/MassOperations.php:64 src/Service/MassOperations.php:67
msgid "New location not found for booking with ID %s"
msgstr "Neuer Standort für Buchung mit ID %s konnte nicht gefunden werden"

Expand Down Expand Up @@ -4211,7 +4210,7 @@ msgstr "Filtergruppen"

#: src/Wordpress/CustomPostType/Map.php:540
msgid "Filter groups can group item or location categories together to allow for filtering in the map."
msgstr "Filtergruppen können Artikel- oder Ortskategorien gruppieren, um eine Filterung auf der Karte zu ermöglichen."
msgstr "Filtergruppen können Artikel- oder Standortkategorien gruppieren, um eine Filterung auf der Karte zu ermöglichen."

#: src/Wordpress/CustomPostType/Map.php:545
msgid "Filter group {#}"
Expand Down Expand Up @@ -4269,6 +4268,14 @@ msgstr "wähle die Kategorie, nach der die auf der Karte angezeigten Standorte v
msgid "Copy to clipboard"
msgstr "In Zwischenablage kopieren"

#: src/Service/MassOperations.php:33
msgid "An error occurred while moving bookings."
msgstr "Beim Umziehen der Buchungen ist ein Fehler aufgetreten."

#: src/Service/MassOperations.php:70
msgid "There is already a booking on the new location during the timeframe of booking with ID %s."
msgstr "Es existiert bereits eine Buchung für den Standort in dem Zeitraum der existierenden Buchung mit der ID %s."

#~ msgid "Unconfirmed"
#~ msgstr "Unbestätigt"

Expand Down
28 changes: 14 additions & 14 deletions languages/commonsbooking.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is distributed under the GPL v2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Commons Booking 2.9.4\n"
"Project-Id-Version: Commons Booking 2.10\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/commonsbooking\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2025-01-03T11:53:49+00:00\n"
"POT-Creation-Date: 2025-01-06T17:27:47+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.11.0\n"
"X-Domain: commonsbooking\n"
Expand Down Expand Up @@ -996,7 +996,7 @@ msgid "Migrate bookings to new format so that they are listed at bookings menu i
msgstr ""

#: includes/OptionsArray.php:1125
#: src/View/MassOperations.php:110
#: src/View/MassOperations.php:109
#: src/View/Migration.php:107
msgid "Migrate bookings"
msgstr ""
Expand Down Expand Up @@ -1959,15 +1959,15 @@ msgid "Not available"
msgstr ""

#: src/View/Booking.php:193
#: src/View/MassOperations.php:39
#: src/View/MassOperations.php:38
#: src/Wordpress/CustomPostType/Booking.php:441
#: src/Wordpress/CustomPostType/Timeframe.php:99
#: templates/shortcode-bookings.php:73
msgid "User"
msgstr ""

#: src/View/Booking.php:197
#: src/View/MassOperations.php:43
#: src/View/MassOperations.php:42
#: src/Wordpress/CustomPostType/Booking.php:959
#: src/Wordpress/CustomPostType/Restriction.php:472
msgid "Status"
Expand Down Expand Up @@ -2140,42 +2140,42 @@ msgstr ""
msgid "<strong>No GPS data could be found for the address entered</strong>. <br>Please check if the address is written correctly. <br>Alternatively, you can enter the GPS data manually into the corresponding fields."
msgstr ""

#: src/View/MassOperations.php:38
#: src/View/MassOperations.php:37
msgid "ID"
msgstr ""

#: src/View/MassOperations.php:40
#: src/View/MassOperations.php:39
msgid "Item name"
msgstr ""

#: src/View/MassOperations.php:41
#: src/View/MassOperations.php:40
msgid "Start-date"
msgstr ""

#: src/View/MassOperations.php:42
#: src/View/MassOperations.php:41
msgid "End-date"
msgstr ""

#: src/View/MassOperations.php:44
#: src/View/MassOperations.php:43
msgid "Location name"
msgstr ""

#: src/View/MassOperations.php:45
#: src/View/MassOperations.php:44
msgid "New location name"
msgstr ""

#: src/View/MassOperations.php:95
#: src/View/MassOperations.php:94
#: src/View/Migration.php:93
msgid "migration in process .. please wait ..."
msgstr ""

#: src/View/MassOperations.php:100
#: src/View/MassOperations.php:99
#: src/View/Migration.php:53
#: src/View/Migration.php:98
msgid "Migration finished"
msgstr ""

#: src/View/MassOperations.php:105
#: src/View/MassOperations.php:104
#: src/View/Migration.php:103
msgid "Migration failed"
msgstr ""
Expand Down
19 changes: 18 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: https://www.wielebenwir.de/verein/unterstutzen
Tags: booking, calendar, sharing, commoning, open-source
Requires at least: 5.9
Tested up to: 6.7
Stable Tag: 2.9.4
Stable Tag: 2.10
Requires PHP: 7.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -80,6 +80,23 @@ CommonsBooking was developed for the ["Commons Cargobike" movement](http://commo

## Changelog

### 2.10 (09.01.2025)
ADDED: When changing the location of an item you will now be given the option to move the bookings to the new location.
ENHANCED: Export of timeframes no longer time out.
ENHANCED: Total breakdowns cancelling all bookings can now be disabled.
ENHANCED: Map filter groups are now easier to configure.
ENHANCED: Loading the map should now be significantly faster.
ENHANCED: Greatly simplified booking codes; they will also not be generated for the past anymore. (thx @nelarsen)
ENHANCED: Show past bookings in [cb_bookings] overview.
FIXED: Booking codes now truly random. (thx @nelarsen)
FIXED: Map sometimes not rendering on certain aspects ratios. (thx @kmohrf)
FIXED: Saving posts should now be faster.
FIXED: Cache warmup not working in some cases.
FIXED: In certain overlapping timeframe configurations timeframes were not shown as bookable. (thx @nelarsen)
FIXED: Disabled restriction creation for all items / locations because of a missing permission check.
UPDATED: Dependencies


### 2.9.4 (17.07.2024)
FIXED: Plugin not usable in multisite mode

Expand Down
Loading

0 comments on commit a78e074

Please sign in to comment.