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

Timestamp:

10/03/2016 07:03:41 AM (10 years ago)

Author:

swissspidy

Message:

I18N: Introduce a user-specific language setting.

By enabling the user to select their preferred locale when editing the profile, we allow for greater personalization of the WordPress admin and therefore a better user experience.

The back end will be displayed in the user's individual locale while the locale used on the front end equals the one set for the whole site. If the user didn't specify a locale, the site's locale will be used as a fallback. The new locale property of the WP_User class can be used to retrieve the user's locale setting.

Props ocean90, ipm-frommen, swissspidy.
Fixes #29783.

File:

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

trunk/src/wp-admin/options.php

@@ -210 +210 @@
                         if ( isset( $_POST[ $option ] ) ) {
                                 $value = $_POST[ $option ];
-                                if ( ! is_array( $value ) )
+                                if ( ! is_array( $value ) ) {
                                         $value = trim( $value );
+                                }
                                 $value = wp_unslash( $value );
                         }
@@ -218 +219 @@
 
                 // Switch translation in case WPLANG was changed.
-                $language = get_option( 'WPLANG' );
-                if ( $language ) {
-                        load_default_textdomain( $language );
-                } else {
-                        unload_textdomain( 'default' );
+                $language      = get_option( 'WPLANG' );
+                $user_language = get_user_locale();
+                if ( $language === $user_language ) {
+                        if ( $language ) {
+                                load_default_textdomain( $language );
+                        } else {
+                                unload_textdomain( 'default' );
+                        }
                 }
         }