Changeset 49566 for trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

Timestamp:

11/12/2020 02:41:19 PM (6 years ago)

Author:

ocean90

Message:

I18N: Revert [49236] for now to investigate alternative implementations.

See #39210, #51678, #26511.

File:

• trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php (modified) (4 diffs)

trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -33 +33 @@
                 add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
                 wp_clean_themes_cache();
-                unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
-
-                /** @var WP_Textdomain_Registry $wp_textdomain_registry */
-                global $wp_textdomain_registry;
-
-                $wp_textdomain_registry->reset();
+                unset( $GLOBALS['wp_themes'] );
+                unset( $GLOBALS['l10n'] );
+                unset( $GLOBALS['l10n_unloaded'] );
+                _get_path_to_translation( null, true );
         }
 
@@ -47 +45 @@
                 remove_filter( 'template_root', array( $this, 'filter_theme_root' ) );
                 wp_clean_themes_cache();
-                unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
-
-                /** @var WP_Textdomain_Registry $wp_textdomain_registry */
-                global $wp_textdomain_registry;
-
-                $wp_textdomain_registry->reset();
+                unset( $GLOBALS['wp_themes'] );
+                unset( $GLOBALS['l10n'] );
+                unset( $GLOBALS['l10n_unloaded'] );
+                _get_path_to_translation( null, true );
 
                 parent::tearDown();
@@ -175 +171 @@
         /**
          * @ticket 37997
-         * @ticket 39210
          */
         public function test_plugin_translation_after_switching_locale_twice() {
@@ -189 +184 @@
 
                 $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_de );
-                $this->assertSame( 'Este es un plugin dummy', $expected_es_es );
+                $this->assertSame( 'This is a dummy plugin', $expected_es_es );
         }