diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
| commit | 28781ebb081ab8d99b30a33f5cd911b3b050bcc9 (patch) | |
| tree | f21e6b7d3dd06002c58dd52ae2eae10d64d62d85 /wp-includes/l10n.php | |
| parent | cbd939114d362bfece3839d7d5d5e07367fd6be8 (diff) | |
| download | wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.gz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.xz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.zip | |
WP Merge to rev 4254
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/l10n.php')
| -rw-r--r-- | wp-includes/l10n.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index ba77c23..b2b099c 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -1,10 +1,4 @@ <?php - -if ( defined('WPLANG') && '' != constant('WPLANG') ) { - include_once(ABSPATH . 'wp-includes/streams.php'); - include_once(ABSPATH . 'wp-includes/gettext.php'); -} - function get_locale() { global $locale; @@ -75,13 +69,15 @@ function load_default_textdomain() { global $l10n; $locale = get_locale(); - $mofile = ABSPATH . "wp-includes/languages/$locale.mo"; + $mofile = ABSPATH . LANGDIR . "/$locale.mo"; load_textdomain('default', $mofile); } -function load_plugin_textdomain($domain, $path = 'wp-content/plugins') { +function load_plugin_textdomain($domain, $path = false) { $locale = get_locale(); + if ( false === $path ) + $path = PLUGINDIR; $mofile = ABSPATH . "$path/$domain-$locale.mo"; load_textdomain($domain, $mofile); @@ -94,4 +90,4 @@ function load_theme_textdomain($domain) { load_textdomain($domain, $mofile); } -?>
\ No newline at end of file +?> |