Changeset 8556 for trunk/wp-includes/l10n.php

Timestamp:

08/05/2008 09:28:50 PM (18 years ago)

Author:

ryan

Message:

Allow merging of similarly named text domains. Props sambauers. fixes #7376 for trunk

File:

• trunk/wp-includes/l10n.php (modified) (2 diffs)

trunk/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);
 }