Changes from trunk/wp-includes/l10n.php at r8065 to branches/2.6/wp-includes/l10n.php at r8557

File:

• branches/2.6/wp-includes/l10n.php (modified) (4 diffs)

branches/2.6/wp-includes/l10n.php

@@ -243 +243 @@
         global $l10n;
 
-        if (isset($l10n[$domain]))
-                return;
-
         if ( is_readable($mofile))
                 $input = new CachedFileReader($mofile);
@@ -251 +248 @@
                 return;
 
-        $l10n[$domain] = new gettext_reader($input);
+        $gettext = new gettext_reader($input);
+
+        if (isset($l10n[$domain])) {
+                $l10n[$domain]->load_tables();
+                $gettext->load_tables();
+                $l10n[$domain]->cache_translations = array_merge($gettext->cache_translations, $l10n[$domain]->cache_translations);
+        } else
+                $l10n[$domain] = $gettext;
+
+        unset($input, $gettext);
 }
 
@@ -257 +263 @@
  * load_default_textdomain() - Loads default translated strings based on locale
  *
- * Loads the .mo file in LANGDIR constant path from WordPress root.
+ * Loads the .mo file in WP_LANG_DIR constant path from WordPress root.
  * The translated (.mo) file is named based off of the locale.
  *
@@ -265 +271 @@
         $locale = get_locale();
 
-        $mofile = ABSPATH . LANGDIR . "/$locale.mo";
+        $mofile = WP_LANG_DIR . "/$locale.mo";
 
         load_textdomain('default', $mofile);