Changeset 49236 for trunk/tests/phpunit/tests/l10n/loadTextdomain.php

Timestamp:

10/20/2020 04:03:58 PM (6 years ago)

Author:

ocean90

Message:

I18N: Introduce WP_Textdomain_Registry to store text domains and their language directory paths.

Previously, when using switch_to_locale() all current loaded text domains were unloaded and added to the $l10n_unloaded global. This prevented the just-in-time loading for text domains after a switch. The just-in-time loading was also only possible if the translations were stored in WP_LANG_DIR. Both issues have been fixed.

• Adds WP_Textdomain_Registry to keep track of the language directory paths for all plugins and themes.
• Updates all load_*_textdomain() functions to store the path in WP_Textdomain_Registry.
• Adds $reloadable parameter to unload_textdomain() to define whether a text domain can be loaded just-in-time again. This is used by WP_Locale_Switcher::load_translations().
• Extends _load_textdomain_just_in_time() to also support text domains of plugins and themes with custom language directories.
• Fixes the incorrect test_plugin_translation_after_switching_locale_twice() test which should have catch this issue earlier.
• Adds a new test plugin/theme to test the loading of translations with a custom language directory.
• Deprecates the now unused and private _get_path_to_translation() and _get_path_to_translation_from_lang_dir() functions.

Props yoavf, swissspidy, dd32, ocean90.
See #26511.
Fixes #39210.

File:

• trunk/tests/phpunit/tests/l10n/loadTextdomain.php (modified) (7 diffs)

trunk/tests/phpunit/tests/l10n/loadTextdomain.php

@@ -25 +25 @@
                 add_filter( 'plugin_locale', array( $this, 'store_locale' ) );
                 add_filter( 'theme_locale', array( $this, 'store_locale' ) );
+
+                /** @var WP_Textdomain_Registry $wp_textdomain_registry */
+                global $wp_textdomain_registry;
+
+                $wp_textdomain_registry->reset();
         }
 
@@ -31 +36 @@
                 remove_filter( 'theme_locale', array( $this, 'store_locale' ) );
 
+                /** @var WP_Textdomain_Registry $wp_textdomain_registry */
+                global $wp_textdomain_registry;
+
+                $wp_textdomain_registry->reset();
+
                 parent::tearDown();
         }
@@ -117 +127 @@
          * @ticket 21319
          */
-        function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
+        public function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
                 $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
                 __( 'just some string', 'wp-tests-domain' );
@@ -123 +133 @@
         }
 
-        function test_override_load_textdomain_noop() {
+        public function test_override_load_textdomain_noop() {
                 add_filter( 'override_load_textdomain', '__return_true' );
                 $load_textdomain = load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/non-existent-file' );
@@ -132 +142 @@
         }
 
-        function test_override_load_textdomain_non_existent_mofile() {
+        public function test_override_load_textdomain_non_existent_mofile() {
                 add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
                 $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/non-existent-file.mo' );
@@ -146 +156 @@
         }
 
-        function test_override_load_textdomain_custom_mofile() {
+        public function test_override_load_textdomain_custom_mofile() {
                 add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
                 $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/plugins/internationalized-plugin-de_DE.mo' );
@@ -166 +176 @@
          * @return bool
          */
-        function _override_load_textdomain_filter( $override, $domain, $file ) {
+        public function _override_load_textdomain_filter( $override, $domain, $file ) {
                 global $l10n;