From 766ff15532b0e3cdc6092ead222bc63e2f18f8ea Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 1 Nov 2016 16:07:32 +0000 Subject: [PATCH] I18N: Revert [39069] as it needs some more work. See #38485 Built from https://develop.svn.wordpress.org/trunk@39070 git-svn-id: http://core.svn.wordpress.org/trunk@39012 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/l10n.php | 8 ++++---- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index adefd82fb2..ba856491af 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -710,7 +710,7 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path * @param string $locale The plugin's current locale. * @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'; @@ -744,7 +744,7 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path */ 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'; @@ -783,7 +783,7 @@ function load_theme_textdomain( $domain, $path = false ) { * @param string $locale The theme's current locale. * @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'; @@ -865,7 +865,7 @@ function _load_textdomain_just_in_time( $domain ) { } } - $locale = is_admin() ? get_user_locale() : get_locale(); + $locale = get_locale(); $mofile = "{$domain}-{$locale}.mo"; if ( in_array( WP_LANG_DIR . '/plugins/' . $mofile, $cached_mofiles ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5cf3a98035..b5c291bb73 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta1-39069'; +$wp_version = '4.7-beta1-39070'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.