fix: Moved loading of textdomain to init callback (#204)

Signed-off-by: Christopher Klein <[email protected]>

index.php

@@ -46,6 +46,9 @@
 
 add_action('plugins_loaded', 'next_ad_int_angular_ajax_params_to_post');
 
+// #204: register `init` hook to make loading the textdomain possible
+add_action('init', array($adiPlugin, '_init'));
+
 // register any hooks after the plug-in has been activated e.g. to display notices for a migration of options
 add_action('admin_init', array($adiPlugin, 'postActivation'));
 

readme.txt

@@ -127,7 +127,8 @@ It is __not__ possible to activate *NADI* for a site inside a network.
 For detailed information you can visit the official [GitHub repository of Next Active Directory Integration](https://github.com/NeosIT/active-directory-integration2)
 
 = UNRELEASED =
-* FIXED: Check for false value if hostname or port contains invalid value and ldap_connect fails.
+* FIXED: Moved loading of textdomain to init callback (#204)
+* FIXED: Check for false value if hostname or port contains invalid value and ldap_connect fails (#203)
 
 = 3.1.7 =
 * CHANGED: WordPress 6.7 compatibility has been checked

src/plug-in/Init.php

@@ -112,10 +112,6 @@ function initialize()
 			return;
 		}
 
-		// load internationalization (i18n)
-		load_plugin_textdomain('next-active-directory-integration', false,
-			plugin_basename(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH) . '/languages');
-
 		// ADI-354 (dme)
 		$configurationService = $this->dc()->getMultisiteConfigurationService();
 
@@ -130,6 +126,17 @@ function initialize()
 		$this->initialized = true;
 	}
 
+	/**
+	 * Hook into WordPress' `load` action to load correct textdomain
+	 * @issue #204
+	 * @return void
+	 */
+	public function _init() {
+		// load internationalization (i18n)
+		load_plugin_textdomain('next-active-directory-integration', false,
+			plugin_basename(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH) . '/languages');
+	}
+
 	/**
 	 * Is called after all plug-ins have been loaded (hook 'plugins_loaded') to gain access to WordPress functions.
 	 * This method mostly delegates to the register* methods in this class. Only required hooks are registered to

test/Nadi/InitTest.php

@@ -28,6 +28,7 @@ public function tearDown(): void
 
 	/**
 	 * @test
+	 * @issue #204
 	 */
 	public function initialize_loadsLanguageFile()
 	{
@@ -36,9 +37,6 @@ public function initialize_loadsLanguageFile()
 		$fakeService = $this->createInitializeEnvironment($dc);
 		$pluginFolderName = basename(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH);
 
-		$fakeService->expects($this->exactly(2))
-			->method('getOptionValue');
-
 		\WP_Mock::userFunction('plugin_basename', array(
 			'args' => array(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH),
 			'times' => 1,
@@ -53,7 +51,7 @@ public function initialize_loadsLanguageFile()
 			),
 			'times' => 1));
 
-		$sut->initialize();
+		$sut->_init();
 	}
 
 	private function createActivationEnvironment($dc)