Changeset 39127 for trunk/src/wp-includes/l10n.php

Timestamp:

11/03/2016 08:07:08 PM (9 years ago)

Author:

swissspidy

Message:

I18N: Use the user's locale when loading text domains in the admin.

Leverages get_user_locale() in load_*_textdomain() and _load_textdomain_just_in_time() to always load translations in the user's language when in the admin.

This re-introduces [39069], but now with additional tests and a function_exists( 'wp_get_current_user' ) check in get_user_locale() in case it gets used early.

Props swissspidy, ocean90.
Fixes #38485.

File:

• trunk/src/wp-includes/l10n.php (modified) (5 diffs)

trunk/src/wp-includes/l10n.php

@@ -89 +89 @@
 function get_user_locale( $user_id = 0 ) {
     $user = false;
-    if ( 0 === $user_id ) {
+    if ( 0 === $user_id && function_exists( 'wp_get_current_user' ) ) {
         $user = wp_get_current_user();
     } elseif ( $user_id instanceof WP_User ) {
@@ -711 +711 @@
      * @param string $domain Text domain. Unique identifier for retrieving translated strings.
      */
-    $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+    $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
 
     $mofile = $domain . '-' . $locale . '.mo';
@@ -745 +745 @@
 function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
     /** This filter is documented in wp-includes/l10n.php */
-    $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+    $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
 
     $mofile = $domain . '-' . $locale . '.mo';
@@ -784 +784 @@
      * @param string $domain Text domain. Unique identifier for retrieving translated strings.
      */
-    $locale = apply_filters( 'theme_locale', get_locale(), $domain );
+    $locale = apply_filters( 'theme_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
 
     $mofile = $domain . '-' . $locale . '.mo';
@@ -866 +866 @@
     }
 
-    $locale = get_locale();
+    $locale = is_admin() ? get_user_locale() : get_locale();
     $mofile = "{$domain}-{$locale}.mo";