Merge branch 'master' into experiment/calendar-optimization

wielebenwir · Jun 22, 2024 · 1fc03dd · 1fc03dd
2 parents 80f68dc + c60046f
commit 1fc03dd
Show file tree

Hide file tree

Showing 21 changed files with 690 additions and 490 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,30 +1,35 @@
 {
-	"phpVersion": "7.4",
-	"core": "Wordpress/Wordpress#6.5",
-        "plugins": [ 
-		".",
-	        "https://downloads.wordpress.org/plugin/wp-crontrol.zip",
-      	        "https://downloads.wordpress.org/plugin/wordpress-importer.zip",
-	        "https://downloads.wordpress.org/plugin/query-monitor.zip",
-		"https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
-		"https://downloads.wordpress.org/plugin/jsm-show-post-meta.zip",
-		"https://downloads.wordpress.org/plugin/disable-welcome-messages-and-tips.zip"
-	],
-	"port": 1000,
-  	"testsPort": 1001,
-  	"config": {
-		"WP_DEBUG": true,
-		"WP_DEBUG_LOG": true,
-    		"WP_DEBUG_DISPLAY": false
-  	},
-	"themes": [
-		"flegfleg/kasimir-theme"
-	],
-        "env": {
-                "tests": {
-                        "mappings": {
-                                "wp-content/plugins/commonsbooking": "."
-                        }
-                }
-        }
+  "phpVersion" : "7.4",
+  "core" : "Wordpress/Wordpress#6.5",
+  "plugins" : [
+    ".",
+    "https://downloads.wordpress.org/plugin/wp-crontrol.zip",
+    "https://downloads.wordpress.org/plugin/wordpress-importer.zip",
+    "https://downloads.wordpress.org/plugin/query-monitor.zip",
+    "https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
+    "https://downloads.wordpress.org/plugin/jsm-show-post-meta.zip",
+    "https://downloads.wordpress.org/plugin/disable-welcome-messages-and-tips.zip"
+  ],
+  "port" : 1000,
+  "testsPort" : 1001,
+  "config" : {
+    "WP_DEBUG" : true,
+    "WP_DEBUG_LOG" : true,
+    "WP_DEBUG_DISPLAY" : false
+  },
+  "themes" : [
+    "flegfleg/kasimir-theme"
+  ],
+  "env" : {
+    "tests" : {
+      "mappings" : {
+        "wp-content/plugins/commonsbooking" : "."
+      },
+      "config" : {
+        "WP_DEBUG" : true,
+        "WP_DEBUG_LOG" : true,
+        "WP_DEBUG_DISPLAY" : false
+      }
+    }
+  }
 }
diff --git a/bin/install-wp-cli.sh b/bin/install-wp-cli.sh
diff --git a/bin/setup-cypress-env.sh b/bin/setup-cypress-env.sh
@@ -1,15 +1,8 @@
-# setup-cypress-env.sh
-# Felipe Elia <[email protected]> and 10up contributors
-#
-# The following code is a derivative work of the code from the ElasticPress project,
-# which is licensed GPLv2. This code therefore is also licensed under the terms
-# of the GNU Public License, version 2.'
-
 #!/bin/bash
 
 # Install our example posts from a WP export file
-./bin/wp-env-cli tests-wordpress "wp --allow-root import /var/www/html/wp-content/plugins/commonsbooking/tests/cypress/wordpress-files/content-example.xml --authors=create"
+wp-env run tests-cli wp import /var/www/html/wp-content/plugins/commonsbooking/tests/cypress/wordpress-files/content-example.xml --authors=create
 # Switch to Kasimir theme
-./bin/wp-env-cli tests-wordpress "wp --allow-root theme activate kasimir-theme"
+wp-env run tests-cli wp theme activate kasimir-theme
 # Create subscriber with username "subscriber" and password "password"
-./bin/wp-env-cli tests-wordpress "wp --allow-root user create subscriber [email protected] --role=subscriber --user_pass=password"
+wp-env run tests-cli wp user create subscriber [email protected] --role=subscriber --user_pass=password
diff --git a/bin/wp-env-cli b/bin/wp-env-cli
diff --git a/languages/commonsbooking-de_DE.po b/languages/commonsbooking-de_DE.po
@@ -1409,15 +1409,15 @@ msgstr "Artikel-Kategorie"
 msgid "Location Category"
 msgstr "Standort-Kategorie"
 
-#: src/Repository/BookingCodes.php:304
+#: src/Repository/BookingCodes.php:328
 msgid "No booking codes could be created because there were no booking codes to choose from. Please set some booking codes in the CommonsBooking settings."
 msgstr "Es konnten keine Buchungscodes erstellt werden, da keine Buchungscodes zur Auswahl standen. Bitte lege einige Buchungscodes in den CommonsBooking-Einstellungen fest."
 
-#: src/Repository/BookingCodes.php:311
+#: src/Repository/BookingCodes.php:335
 msgid "No booking codes could be created because the location of the timeframe could not be found."
 msgstr "Es konnten keine Buchungscodes erstellt werden, da der Standort nicht gefunden wurde."
 
-#: src/Repository/BookingCodes.php:317
+#: src/Repository/BookingCodes.php:341
 msgid "No booking codes could be created because the item of the timeframe could not be found."
 msgstr "Es konnten keine Buchungscodes erstellt werden, da der Artikel nicht gefunden wurde."
 

diff --git a/languages/commonsbooking.pot b/languages/commonsbooking.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-05T11:41:25+00:00\n"
+"POT-Creation-Date: 2024-06-17T20:26:25+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: commonsbooking\n"
@@ -1599,15 +1599,15 @@ msgstr ""
 msgid "CommonsBooking Bookings"
 msgstr ""
 
-#: src/Repository/BookingCodes.php:304
+#: src/Repository/BookingCodes.php:328
 msgid "No booking codes could be created because there were no booking codes to choose from. Please set some booking codes in the CommonsBooking settings."
 msgstr ""
 
-#: src/Repository/BookingCodes.php:311
+#: src/Repository/BookingCodes.php:335
 msgid "No booking codes could be created because the location of the timeframe could not be found."
 msgstr ""
 
-#: src/Repository/BookingCodes.php:317
+#: src/Repository/BookingCodes.php:341
 msgid "No booking codes could be created because the item of the timeframe could not be found."
 msgstr ""