diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-19 13:07:48 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-19 13:07:48 +0000 |
| commit | b58719caa0f572f09019c5a349ae42126cc637eb (patch) | |
| tree | 022fdc8e9bacbfa307d1f3b60086b49afe86986b /wp-includes/l10n.php | |
| parent | acdcdacc2fe65422a3f52e3320283feba13d9c40 (diff) | |
| download | wordpress-mu-b58719caa0f572f09019c5a349ae42126cc637eb.tar.gz wordpress-mu-b58719caa0f572f09019c5a349ae42126cc637eb.tar.xz wordpress-mu-b58719caa0f572f09019c5a349ae42126cc637eb.zip | |
WP Merge to rev 4771
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@852 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/l10n.php')
| -rw-r--r-- | wp-includes/l10n.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 7408e17..4a0a640 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -10,7 +10,7 @@ function get_locale() { $locale = WPLANG; if (empty($locale)) - $locale = 'en_US'; + $locale = ''; $locale = apply_filters('locale', $locale); @@ -69,6 +69,9 @@ function load_default_textdomain() { global $l10n; $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; + $mofile = ABSPATH . LANGDIR . "/$locale.mo"; load_textdomain('default', $mofile); @@ -76,6 +79,9 @@ function load_default_textdomain() { function load_plugin_textdomain($domain, $path = false) { $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; + if ( false === $path ) $path = PLUGINDIR; @@ -85,6 +91,8 @@ function load_plugin_textdomain($domain, $path = false) { function load_theme_textdomain($domain) { $locale = get_locale(); + if ( empty($locale) ) + $locale = 'en_US'; $mofile = get_template_directory() . "/$locale.mo"; load_textdomain($domain, $mofile); |