Changeset 39122 for trunk/src/wp-admin/options.php

Timestamp:

11/03/2016 05:54:42 PM (10 years ago)

Author:

ocean90

Message:

I18N: Show "Settings saved." in the correct language after switching the site language.

This simplifies the logic by comparing get_user_locale() before and after an settings update.

Props swissspidy, ocean90.
See #29783, #29281.
Fixes #38482.

File:

• trunk/src/wp-admin/options.php (modified) (2 diffs)

trunk/src/wp-admin/options.php

@@ -195 +195 @@
 
         if ( $options ) {
+                $user_language_old = get_user_locale();
+
                 foreach ( $options as $option ) {
                         if ( $unregistered ) {
@@ -218 +220 @@
                 }
 
-                // Switch translation in case WPLANG was changed.
-                $language      = get_option( 'WPLANG' );
-                $user_language = get_user_locale();
-                if ( $language === $user_language ) {
-                        if ( $language ) {
-                                load_default_textdomain( $language );
-                        } else {
-                                unload_textdomain( 'default' );
-                        }
+                /*
+                 * Switch translation in case WPLANG was changed.
+                 * The global $locale is used in get_locale() which is
+                 * used as a fallback in get_user_locale().
+                 */
+                unset( $GLOBALS['locale'] );
+                $user_language_new = get_user_locale();
+                if ( $user_language_old !== $user_language_new  ) {
+                        load_default_textdomain( $user_language_new );
                 }
         }