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

Timestamp:

11/01/2016 04:06:21 PM (10 years ago)

Author:

johnbillion

Message:

I18N: Revert [39069] as it needs some more work.

See #38485

File:

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

trunk/src/wp-includes/l10n.php

@@ -711 +711 @@
          * @param string $domain Text domain. Unique identifier for retrieving translated strings.
          */
-        $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
+        $locale = apply_filters( 'plugin_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', is_admin() ? get_user_locale() : get_locale(), $domain );
+        $locale = apply_filters( 'plugin_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', is_admin() ? get_user_locale() : get_locale(), $domain );
+        $locale = apply_filters( 'theme_locale', get_locale(), $domain );
 
         $mofile = $domain . '-' . $locale . '.mo';
@@ -866 +866 @@
         }
 
-        $locale = is_admin() ? get_user_locale() : get_locale();
+        $locale = get_locale();
         $mofile = "{$domain}-{$locale}.mo";