Ticket #26511: 26511.4.diff

new file src/wp-includes/class-wp-locale-switcher.php

@@ +1 @@
+<?php
+/**
+ * Locale switcher object.
+ *
+ * @package WordPress
+ * @subpackage i18n
+ * @since 4.7.0
+ */
+
+/**
+ * Class for switching locales.
+ *
+ * @since 4.7.0
+ */
+class WP_Locale_Switcher {
+        /**
+         * Locale stack.
+         *
+         * @since 4.7.0
+         * @access private
+         * @var string[]
+         */
+        private $locales = array();
+
+        /**
+         * Original locale.
+         *
+         * @since 4.7.0
+         * @access private
+         * @var string
+         */
+        private $original_locale;
+
+        /**
+         * Holds all available languages.
+         *
+         * @since 4.7.0
+         * @access private
+         * @var array An array of language codes (file names without the .mo extension).
+         */
+        private $available_languages = array();
+
+        /**
+         * Constructor.
+         *
+         * Stores the original locale as well as a list of all available languages.
+         * Hooks into the {@see 'locale'} filter to change the locale on the fly.
+         *
+         * @since 4.7.0
+         */
+        public function __construct() {
+                $this->original_locale     = get_locale();
+                $this->available_languages = get_available_languages();
+
+                add_filter( 'locale', array( $this, 'filter_locale' ) );
+        }
+
+        /**
+         * Switches the translations according to the given locale.
+         *
+         * @since 4.7.0
+         *
+         * @global WP_Locale $wp_locale The WordPress date and time locale object.
+         *
+         * @param string $locale The locale to switch to.
+         * @return bool True on success, false on failure.
+         */
+        public function switch_to_locale( $locale ) {
+                if ( $locale === get_locale() || ( is_admin() && $locale === get_user_locale() ) ) {
+                        return false;
+                }
+
+                if ( ! in_array( $locale, $this->available_languages ) ) {
+                        return false;
+                }
+
+                $this->locales[] = $locale;
+
+                $this->load_translations( $locale );
+
+                /**
+                 * Fires when the locale is switched.
+                 *
+                 * @since 4.7.0
+                 *
+                 * @param string $locale The new locale.
+                 */
+                do_action( 'switch_locale', $locale );
+
+                $GLOBALS['wp_locale'] = new WP_Locale();
+
+                return true;
+        }
+
+        /**
+         * Restores the translations according to the previous locale.
+         *
+         * @since 4.7.0
+         *
+         * @global WP_Locale $wp_locale The WordPress date and time locale object.
+         *
+         * @return string|false Locale on success, false on failure.
+         */
+        public function restore_previous_locale() {
+                $previous_locale = array_pop( $this->locales );
+
+                if ( null === $previous_locale ) {
+                        // The stack is empty, bail.
+                        return false;
+                }
+
+                $locale = end( $this->locales );
+
+                if ( ! $locale ) {
+                        // There's nothing left in the stack: go back to the original locale.
+                        $locale = $this->original_locale;
+                }
+
+                $this->load_translations( $locale );
+
+                /**
+                 * Fires when the locale is restored to the previous one.
+                 *
+                 * @since 4.7.0
+                 *
+                 * @param string $locale          The new locale.
+                 * @param string $previous_locale The previous locale.
+                 */
+                do_action( 'restore_previous_locale', $locale, $previous_locale );
+
+                $GLOBALS['wp_locale'] = new WP_Locale();
+
+                return $locale;
+        }
+
+        /**
+         * Filters the WordPress install's locale.
+         *
+         * @since 4.7.0
+         *
+         * @param string $locale The WordPress install's locale.
+         * @return string The locale currently being switched to.
+         */
+        public function filter_locale( $locale ) {
+                $switched_locale = end( $this->locales );
+
+                if ( $switched_locale ) {
+                        return $switched_locale;
+                }
+
+                return $locale;
+        }
+
+        /**
+         * Load translations for a given locale.
+         *
+         * When switching to a locale, translations for this locale must be loaded from scratch.
+         *
+         * @since 4.7.0
+         *
+         * @global Mo[] $l10n An array of all currently loaded text domains.
+         *
+         * @param string $locale The locale to load translations for.
+         */
+        private function load_translations( $locale ) {
+                global $l10n;
+
+                if ( ! $l10n ) {
+                        $l10n = array();
+                }
+
+                load_default_textdomain( $locale );
+
+                /* @var MO $mo */
+                foreach ( $l10n as $domain => $mo ) {
+                        if ( 'default' === $domain ) {
+                                continue;
+                        }
+
+                        unload_textdomain( $domain );
+
+                        if ( $mo->get_filename() ) {
+                                load_textdomain( $domain, $mo->get_filename() );
+                        }
+
+                        get_translations_for_domain( $domain );
+                }
+        }
+}

src/wp-includes/l10n.php

@@ -1148 +1148 @@
                 return false;
         }
         return $wp_locale->is_rtl();
-}
- No newline at end of file
+}
+
+/**
+ * Switches the translations according to the given locale.
+ *
+ * @since 4.7.0
+ *
+ * @global WP_Locale_Switcher $wp_locale_switcher
+ *
+ * @param string $locale The locale.
+ * @return bool True on success, false on failure.
+ */
+function switch_to_locale( $locale ) {
+        /* @var WP_Locale_Switcher $wp_locale_switcher */
+        global $wp_locale_switcher;
+
+        return $wp_locale_switcher->switch_to_locale( $locale );
+}
+
+/**
+ * Restores the translations according to the previous locale.
+ *
+ * @since 4.7.0
+ *
+ * @global WP_Locale_Switcher $wp_locale_switcher
+ *
+ * @return string|false Locale on success, false on error.
+ */
+function restore_previous_locale() {
+        /* @var WP_Locale_Switcher $wp_locale_switcher */
+        global $wp_locale_switcher;
+
+        return $wp_locale_switcher->restore_previous_locale();
+}

src/wp-includes/load.php

@@ -851 +851 @@
  * @staticvar bool $loaded
  */
 function wp_load_translations_early() {
-        global $text_direction, $wp_locale;
+        global $text_direction, $wp_locale, $wp_locale_switcher;
 
         static $loaded = false;
         if ( $loaded )
@@ -868 +868 @@
         require_once ABSPATH . WPINC . '/pomo/mo.php';
         require_once ABSPATH . WPINC . '/l10n.php';
         require_once ABSPATH . WPINC . '/class-wp-locale.php';
+        require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
 
         // General libraries
         require_once ABSPATH . WPINC . '/plugin.php';
@@ -919 +920 @@
         }
 
         $wp_locale = new WP_Locale();
+        $wp_locale_switcher = new WP_Locale_Switcher();
 }
 
 /**

src/wp-includes/pomo/mo.php

@@ -16 +16 @@
         var $_nplurals = 2;
 
         /**
+         * Loaded MO file.
+         *
+         * @var string
+         */
+        private $filename = '';
+
+        /**
+         * Returns the loaded MO file.
+         *
+         * @return string The loaded MO file.
+         */
+        public function get_filename() {
+                return $this->filename;
+        }
+
+        /**
          * Fills up with the entries from MO file $filename
          *
          * @param string $filename MO file to load
          */
         function import_from_file($filename) {
-                $reader = new POMO_FileReader($filename);
-                if (!$reader->is_resource())
+                $reader = new POMO_FileReader( $filename );
+
+                if ( ! $reader->is_resource() ) {
                         return false;
-                return $this->import_from_reader($reader);
+                }
+
+                $this->filename = (string) $filename;
+
+                return $this->import_from_reader( $reader );
         }
 
         /**
@@ -299 +320 @@
                 return $this->_nplurals;
         }
 }
-endif;
- No newline at end of file
+endif;

src/wp-settings.php

@@ -131 +131 @@
 // Load the L10n library.
 require_once( ABSPATH . WPINC . '/l10n.php' );
 require_once( ABSPATH . WPINC . '/class-wp-locale.php' );
+require_once( ABSPATH . WPINC . '/class-wp-locale-switcher.php' );
 
 // Run the installer if WordPress is not installed.
 wp_not_installed();
@@ -384 +385 @@
  */
 $GLOBALS['wp_locale'] = new WP_Locale();
 
+/**
+ *  WordPress Locale Switcher object for switching locales.
+ *
+ * @since 4.7.0
+ *
+ * @global WP_Locale_Switcher $wp_locale_switcher
+ */
+$GLOBALS['wp_locale_switcher'] = new WP_Locale_Switcher();
+
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
         if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )

tests/phpunit/tests/l10n.php

@@ -85 +85 @@
                 $this->assertEmpty( $array );
 
                 $array = get_available_languages( DIR_TESTDATA . '/languages/' );
-                $this->assertEquals( array( 'en_GB', 'es_ES' ), $array );
+                $this->assertEquals( array( 'de_DE', 'en_GB', 'es_ES' ), $array );
         }
 
         /**

tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -141 +141 @@
                 $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output_final );
                 $this->assertTrue( $is_textdomain_loaded_final );
         }
+
+        /**
+         * @ticket 26511
+         */
+        public function test_plugin_translation_after_switching_locale() {
+                require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+                switch_to_locale( 'de_DE' );
+                $expected = i18n_plugin_test();
+                restore_previous_locale();
+
+                $this->assertSame( 'Das ist ein Dummy Plugin', $expected );
+        }
+
+        /**
+         * @ticket 26511
+         */
+        public function test_theme_translation_after_switching_locale() {
+                switch_theme( 'internationalized-theme' );
+
+                require_once get_stylesheet_directory() . '/functions.php';
+
+                switch_to_locale( 'de_DE' );
+                $expected = i18n_theme_test();
+                restore_previous_locale();
+
+                $this->assertSame( 'Das ist ein Dummy Theme', $expected );
+        }
 }

new file tests/phpunit/tests/l10n/localeSwitcher.php

@@ +1 @@
+<?php
+
+/**
+ * @group l10n
+ * @group i18n
+ */
+class Tests_Locale_Switcher extends WP_UnitTestCase {
+        /**
+         * @var string
+         */
+        protected $locale = '';
+
+        /**
+         * @var string
+         */
+        protected $previous_locale = '';
+
+        public function setUp() {
+                $this->locale = '';
+                $this->previous_locale = '';
+        }
+
+        public function test_switch_to_non_existent_locale_returns_false() {
+                $this->assertFalse( switch_to_locale( 'foo_BAR' ) );
+        }
+
+        public function test_switch_to_non_existent_locale_does_not_change_locale() {
+                switch_to_locale( 'foo_BAR' );
+
+                $this->assertSame( 'en_US', get_locale() );
+        }
+
+        public function test_switch_to_locale_returns_true() {
+                $expected = switch_to_locale( 'en_GB' );
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertTrue( $expected );
+        }
+
+        public function test_switch_to_locale_changes_the_locale() {
+                switch_to_locale( 'en_GB' );
+
+                $locale = get_locale();
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertSame( 'en_GB', $locale );
+        }
+
+        public function test_switch_to_locale_loads_translation() {
+                switch_to_locale( 'es_ES' );
+
+                $actual = __( 'Invalid parameter.' );
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertSame( 'Parámetro no válido. ', $actual );
+        }
+
+        public function test_switch_to_locale_changes_wp_locale_global() {
+                global $wp_locale;
+
+                $expected = array(
+                        'thousands_sep' => '.',
+                        'decimal_point' => ',',
+                );
+
+                switch_to_locale( 'de_DE' );
+
+                $wp_locale_de_DE = clone $wp_locale;
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertEqualSetsWithIndex( $expected, $wp_locale_de_DE->number_format );
+        }
+
+        public function test_switch_to_locale_multiple_times() {
+                switch_to_locale( 'en_GB' );
+                switch_to_locale( 'es_ES' );
+                $locale = get_locale();
+
+                // Cleanup.
+                restore_previous_locale();
+                restore_previous_locale();
+
+                $this->assertSame( 'es_ES', $locale );
+        }
+
+        public function test_switch_to_locale_multiple_times_loads_translation() {
+                switch_to_locale( 'en_GB' );
+                switch_to_locale( 'de_DE' );
+                switch_to_locale( 'es_ES' );
+
+                $actual = __( 'Invalid parameter.' );
+
+                // Cleanup.
+                restore_previous_locale();
+                restore_previous_locale();
+                restore_previous_locale();
+
+                $this->assertSame( 'Parámetro no válido. ', $actual );
+        }
+
+        public function test_restore_previous_locale_without_switching() {
+                $this->assertFalse( restore_previous_locale() );
+        }
+
+        public function test_restore_previous_locale_changes_the_locale_back() {
+                switch_to_locale( 'en_GB' );
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertSame( 'en_US', get_locale() );
+        }
+
+        public function test_restore_previous_locale_after_switching_multiple_times() {
+                switch_to_locale( 'en_GB' );
+                switch_to_locale( 'es_ES' );
+                restore_previous_locale();
+
+                $locale = get_locale();
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertSame( 'en_GB', $locale );
+        }
+
+        public function test_restore_previous_locale_restores_translation() {
+                switch_to_locale( 'es_ES' );
+                restore_previous_locale();
+
+                $actual = __( 'Invalid parameter.' );
+
+                $this->assertSame( 'Invalid parameter.', $actual );
+        }
+
+        public function test_restore_previous_locale_action_passes_previous_locale() {
+                switch_to_locale( 'en_GB' );
+                switch_to_locale( 'es_ES' );
+
+                add_action( 'restore_previous_locale', array( $this, 'store_locale' ), 10, 2 );
+
+                restore_previous_locale();
+
+                $previous_locale = $this->previous_locale;
+
+                // Cleanup.
+                restore_previous_locale();
+
+                $this->assertSame( 'es_ES', $previous_locale );
+        }
+
+        public function test_restore_previous_locale_restores_wp_locale_global() {
+                global $wp_locale;
+
+                $expected = array(
+                        'thousands_sep' => ',',
+                        'decimal_point' => '.',
+                );
+
+                switch_to_locale( 'de_DE' );
+                restore_previous_locale();
+
+                $this->assertEqualSetsWithIndex( $expected, $wp_locale->number_format );
+        }
+
+        public function store_locale( $locale, $previous_locale ) {
+                $this->locale = $locale;
+                $this->previous_locale = $previous_locale;
+        }
+}

tests/phpunit/tests/locale.php

@@ -1 +1 @@
 <?php
 
 /**
- * @group locale
+ * @group l10n
  * @group i18n
  */
 class Tests_Locale extends WP_UnitTestCase {