Ticket #26511: 26511.2.patch

src/wp-includes/class-wp-locale-storage.php

@@ +1 @@
+<?php
+/**
+ * Locale API: WP_Locale_Storage class
+ *
+ * @package WordPress
+ * @subpackage i18n
+ * @since 4.6.0
+ */
+
+/**
+ * Core class for locale storage objects with a getter.
+ *
+ * @since 4.6.0
+ */
+class WP_Locale_Storage {
+
+        /**
+         * The stored locale.
+         *
+         * @since 4.6.0
+         * @var string
+         */
+        private $locale;
+
+        /**
+         * Constructor. Stores the given locale.
+         *
+         * @since 4.6.0
+         *
+         * @param string $locale The locale.
+         */
+        public function __construct( $locale ) {
+                $this->locale = (string) $locale;
+        }
+
+        /**
+         * Returns the stored locale.
+         *
+         * @since 4.6.0
+         *
+         * @return string The stored locale.
+         */
+        public function get() {
+                return $this->locale;
+        }
+}

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

@@ +1 @@
+<?php
+/**
+ * Locale API: WP_Locale_Switcher class
+ *
+ * @package WordPress
+ * @subpackage i18n
+ * @since 4.6.0
+ */
+
+/**
+ * Core class used for switching locales.
+ *
+ * @since 4.6.0
+ */
+class WP_Locale_Switcher {
+
+        /**
+         * Filter callbacks.
+         *
+         * @since 4.6.0
+         * @var callback[]
+         */
+        private $filters = array();
+
+        /**
+         * Locale stack.
+         *
+         * @since 4.6.0
+         * @var string[]
+         */
+        private $locales = array();
+
+        /**
+         * Original locale.
+         *
+         * @since 4.6.0
+         * @var string
+         */
+        private $original_locale;
+
+        /**
+         * Translation objects.
+         *
+         * @since 4.6.0
+         * @var NOOP_Translations[][]
+         */
+        private $translations = array();
+
+        /**
+         * Constructor. Stores the original locale.
+         *
+         * @since 4.6.0
+         */
+        public function __construct() {
+                $this->original_locale = get_locale();
+        }
+
+        /**
+         * Switches the translations according to the given locale.
+         *
+         * @since 4.6.0
+         *
+         * @param string $locale The locale.
+         * @return bool True on success, false on failure.
+         */
+        public function switch_to_locale( $locale ) {
+                $current_locale = get_locale();
+                if ( $current_locale === $locale ) {
+                        return false;
+                }
+
+                /**
+                 * @global MO[] $l10n
+                 */
+                global $l10n;
+
+                $textdomains = array_keys( $l10n );
+
+                if ( ! $this->has_translations_for_locale( $current_locale ) ) {
+                        foreach ( $textdomains as $textdomain ) {
+                                $this->translations[ $current_locale ][ $textdomain ] = get_translations_for_domain( $textdomain );
+                        }
+                }
+
+                $this->remove_filters();
+
+                $this->add_filter_for_locale( $locale );
+
+                if ( $this->has_translations_for_locale( $locale ) ) {
+                        foreach ( $textdomains as $textdomain ) {
+                                if ( isset( $this->translations[ $locale ][ $textdomain ] ) ) {
+                                        $l10n[ $textdomain ] = $this->translations[ $locale ][ $textdomain ];
+                                }
+                        }
+                } else {
+                        foreach ( $l10n as $textdomain => $mo ) {
+                                if ( 'default' === $textdomain ) {
+                                        load_default_textdomain();
+
+                                        continue;
+                                }
+
+                                unload_textdomain( $textdomain );
+
+                                if ( $mofile = $mo->get_filename() ) {
+                                        load_textdomain( $textdomain, $mofile );
+                                }
+
+                                $this->translations[ $locale ][ $textdomain ] = get_translations_for_domain( $textdomain );
+                        }
+                }
+
+                /**
+                 * @global WP_Locale $wp_locale
+                 */
+                $GLOBALS['wp_locale'] = new WP_Locale();
+
+                $this->locales[] = $locale;
+
+                return true;
+        }
+
+        /**
+         * Restores the translations according to the previous locale.
+         *
+         * @since 4.6.0
+         *
+         * @return string|false Locale on success, false on error.
+         */
+        public function restore_locale() {
+                if ( ! array_pop( $this->locales ) ) {
+                        // The stack is empty, bail.
+                        return false;
+                }
+
+                $this->remove_filters();
+
+                if ( $locale = end( $this->locales ) ) {
+                        if ( isset( $this->filters[ $locale ] ) ) {
+                                add_filter( 'locale', $this->filters[ $locale ] );
+                        }
+                } else {
+                        // There's nothing left in the stack: go back to the original locale.
+                        $locale = $this->original_locale;
+                }
+
+                /**
+                 * @global MO[] $l10n
+                 */
+                global $l10n;
+
+                foreach ( array_keys( $l10n ) as $textdomain ) {
+                        if ( isset( $this->translations[ $locale ][ $textdomain ] ) ) {
+                                $l10n[ $textdomain ] = $this->translations[ $locale ][ $textdomain ];
+                        }
+                }
+
+                /**
+                 * @global WP_Locale $wp_locale
+                 */
+                $GLOBALS['wp_locale'] = new WP_Locale();
+
+                return $locale;
+        }
+
+        /**
+         * Checks if there are cached translations for the given locale.
+         *
+         * @since 4.6.0
+         *
+         * @param string $locale The locale.
+         * @return bool True if there are cached translations for the given locale, false otherwise.
+         */
+        private function has_translations_for_locale( $locale ) {
+                return ! empty( $this->translations[ $locale ] );
+        }
+
+        /**
+         * Removes all filter callbacks added before.
+         *
+         * @since 4.6.0
+         */
+        private function remove_filters() {
+                foreach ( $this->filters as $filter ) {
+                        remove_filter( 'locale', $filter );
+                }
+        }
+
+        /**
+         * Adds a filter callback returning the given locale.
+         *
+         * @since 4.6.0
+         *
+         * @param string $locale The locale.
+         */
+        private function add_filter_for_locale( $locale ) {
+                if ( ! isset( $this->filters[ $locale ] ) ) {
+                        require_once ABSPATH . WPINC . '/class-wp-locale-storage.php';
+
+                        // This SHOULD be a closure.
+                        $this->filters[ $locale ] = array( new WP_Locale_Storage( $locale ), 'get' );
+                }
+
+                add_filter( 'locale', $this->filters[ $locale ] );
+        }
+}

src/wp-includes/locale.php

@@ -10 +10 @@
 /** WP_Locale class */
 require_once ABSPATH . WPINC . '/class-wp-locale.php';
 
+/** WP_Locale_Switcher class */
+require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
+
 /**
  * Checks if current locale is RTL.
  *
@@ -21 +24 @@
  */
 function is_rtl() {
         global $wp_locale;
+
         return $wp_locale->is_rtl();
 }
+
+/**
+ * Switches the translations according to the given locale.
+ *
+ * @since 4.6.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 ) {
+        global $wp_locale_switcher;
+
+        return $wp_locale_switcher->switch_to_locale( $locale );
+}
+
+/**
+ * Restores the translations according to the previous locale.
+ *
+ * @since 4.6.0
+ *
+ * @global WP_Locale_Switcher $wp_locale_switcher
+ *
+ * @return string|false Locale on success, false on error.
+ */
+function restore_locale() {
+        global $wp_locale_switcher;
+
+        return $wp_locale_switcher->restore_locale();
+}

src/wp-includes/pomo/mo.php

@@ -16 +16 @@
         var $_nplurals = 2;
 
         /**
+         * Loaded MO file.
+         *
+         * @since 4.6.0
+         * @var string
+         */
+        private $filename = '';
+
+        /**
+         * Returns the loaded MO file.
+         *
+         * @since 4.6.0
+         *
+         * @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
@@ -24 +43 @@
                 $reader = new POMO_FileReader($filename);
                 if (!$reader->is_resource())
                         return false;
+                $this->filename = (string) $filename;
                 return $this->import_from_reader($reader);
         }
 
@@ -299 +319 @@
                 return $this->_nplurals;
         }
 }
-endif;
- No newline at end of file
+endif;

src/wp-settings.php

@@ -379 +379 @@
  */
 $GLOBALS['wp_locale'] = new WP_Locale();
 
+/**
+ * WordPress Locale Switcher object for switching locales.
+ * @global WP_Locale_Switcher $wp_locale_switcher
+ * @since 4.6.0
+ */
+$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' ) )