diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-09 11:39:17 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-09 11:39:17 +0000 |
| commit | 75e0ccc3a64e164d036da4f71f458520ddea3b24 (patch) | |
| tree | 94f00db692e25c95030f7984c27178e1bd7e1bcd /wp-includes/l10n.php | |
| parent | ca036ad95fc44c318275ab539a52f1eb6fddf060 (diff) | |
| download | wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.tar.gz wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.tar.xz wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.zip | |
WP Merge - needs testing.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@797 7be80a69-a1ef-0310-a953-fb0f7c49ff36
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); |