diff options
Diffstat (limited to 'wp-includes/l10n.php')
| -rw-r--r-- | wp-includes/l10n.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index b2b099c..a29bf26 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -6,11 +6,15 @@ function get_locale() { return $locale; // WPLANG is defined in wp-config. - if (defined('WPLANG')) + if ( defined('WPLANG') && '' != WPLANG ) $locale = WPLANG; + else if ( is_admin() ) + $locale = get_user_lang_code(); + else + $locale = get_blog_lang_code(); if (empty($locale)) - $locale = 'en_US'; + $locale = 'en'; $locale = apply_filters('locale', $locale); |