Merge pull request #217 from RRZE-Webteam/dev

v2.2.13
RRZE-Webteam · Nov 18, 2024 · d45a570 · d45a570
2 parents d9c5fd1 + 8f4387b
commit d45a570
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/includes/Main.php b/includes/Main.php
@@ -38,7 +38,7 @@ public function __construct()
      * Add the settings link to the list of plugins.
      *
      * @param array $links
-     * @return void
+     * @return array
      */
     public function settingsLink($links)
     {

diff --git a/rrze-calendar.php b/rrze-calendar.php
@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Calendar
 Plugin URI:      https://github.com/RRZE-Webteam/rrze-calendar
 Description:     Import and output of FAU public events.
-Version:         2.2.12
+Version:         2.2.13
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License v3.0
@@ -31,6 +31,7 @@
 register_deactivation_hook(__FILE__, __NAMESPACE__ . '\deactivation');
 
 add_action('plugins_loaded', __NAMESPACE__ . '\loaded');
+add_action('init', __NAMESPACE__ . '\init');
 
 /**
  * loadTextdomain
@@ -78,7 +79,6 @@ function systemRequirements(): string
  */
 function activation()
 {
-    loadTextdomain();
     if ($error = systemRequirements()) {
         deactivate_plugins(plugin_basename(__FILE__));
         wp_die(
@@ -94,6 +94,7 @@ function activation()
     add_action(
         'init',
         function () {
+            loadTextdomain();
             CalendarEvent::registerPostType();
             CalendarFeed::registerPostType();
             flush_rewrite_rules(false);
@@ -103,6 +104,10 @@ function () {
     flush_rewrite_rules(false);
 }
 
+function init() {
+    loadTextdomain();
+}
+
 /**
  * Deactivation callback function.
  */
@@ -143,7 +148,6 @@ function settings()
  */
 function loaded()
 {
-    loadTextdomain();
     plugin()->loaded();
     if ($error = systemRequirements()) {
         add_action('admin_init', function () use ($error) {