Merge pull request #190 from RRZE-Webteam/dev

Dev
RRZE-Webteam · Feb 19, 2024 · 7b09817 · 7b09817
2 parents 26f20ba + 3a5538e
commit 7b09817
Show file tree

Hide file tree

Showing 67 changed files with 862 additions and 401 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "require": {
         "php": "^8.1.0",
+        "rrze/wp": "^2.0",
         "johngrogg/ics-parser": "^3.3.1",
         "rlanvin/php-rrule": "^2.4.1",
         "cmb2/cmb2": "^2.10.1"

diff --git a/includes/Main.php b/includes/Main.php
@@ -20,6 +20,8 @@ public function __construct()
         add_action('admin_enqueue_scripts', [$this, 'adminEnqueueScripts']);
         add_action('wp_enqueue_scripts', [$this, 'wpEnqueueScripts']);
 
+        settings()->loaded();
+
         CalendarEvent::init();
         CalendarFeed::init();
 

diff --git a/includes/Options/Fields/ButtonLink.php b/includes/Options/Fields/ButtonLink.php
diff --git a/includes/Options/Fields/Checkbox.php b/includes/Options/Fields/Checkbox.php
diff --git a/includes/Options/Fields/CheckboxMultiple.php b/includes/Options/Fields/CheckboxMultiple.php
diff --git a/includes/Options/Fields/Choices.php b/includes/Options/Fields/Choices.php
diff --git a/includes/Options/Fields/SelectMultiple.php b/includes/Options/Fields/SelectMultiple.php
diff --git a/includes/Options/Fields/TextSecure.php b/includes/Options/Fields/TextSecure.php
diff --git a/includes/Options/Template.php b/includes/Options/Template.php
diff --git a/includes/Options/Utils.php b/includes/Options/Utils.php
diff --git a/includes/Options/templates/fields/button-link.php b/includes/Options/templates/fields/button-link.php
diff --git a/includes/Options/templates/fields/choices.php b/includes/Options/templates/fields/choices.php
diff --git a/includes/Options/templates/fields/text-secure.php b/includes/Options/templates/fields/text-secure.php
diff --git a/includes/Settings.php b/includes/Settings.php
@@ -4,7 +4,7 @@
 
 defined('ABSPATH') || exit;
 
-use RRZE\Calendar\Options\Settings as OptionsSettings;
+use RRZE\WP\Settings\Settings as OptionsSettings;
 
 class Settings
 {
@@ -13,6 +13,11 @@ class Settings
     protected $settings;
 
     public function __construct()
+    {
+        add_action('rrze_wp_settings_after_update_option', [$this, 'flushRewriteRules']);
+    }
+
+    public function loaded()
     {
         $this->settings = new OptionsSettings(__('Calendar Settings', 'rrze-calendar'), 'rrze-calendar');
 
@@ -59,12 +64,19 @@ public function __construct()
         $this->settings->build();
     }
 
+    public function flushRewriteRules($optionName)
+    {
+        if ($optionName === self::OPTION_NAME) {
+            flush_rewrite_rules(false);
+        }
+    }
+
     public function validateEndpointSlug($value)
     {
-        if ($validation = strlen(sanitize_title($value)) > 4) {
-            flush_rewrite_rules();
+        if (mb_strlen(sanitize_title($value)) < 4) {
+            return false;
         }
-        return $validation;
+        return true;
     }
 
     public function getOption($option)

diff --git a/languages/rrule/de.php b/languages/rrule/de.php
@@ -76,13 +76,13 @@
     ],
     'byweekday' => ' %{weekdays}',
     'weekdays' => [
-        1 => 'montags',
-        2 => 'dienstags',
-        3 => 'mittwochs',
-        4 => 'donnerstags',
-        5 => 'freitags',
-        6 => 'samstags',
-        7 => 'sonntags',
+        1 => 'Montag',
+        2 => 'Dienstag',
+        3 => 'Mittwoch',
+        4 => 'Donnerstag',
+        5 => 'Freitag',
+        6 => 'Samstag',
+        7 => 'Sonntag',
     ],
     'nth_weekday' => [
         '1' => 'der erste %{weekday}', // e.g. the first Monday

diff --git a/languages/rrze-calendar-de_DE.mo b/languages/rrze-calendar-de_DE.mo