* code for task#1670.

2013-08-06 17:09:23 +08:00
parent fb7fb60ac7
commit b77e1b16da
22 changed files with 375 additions and 237 deletions
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -1463,6 +1463,19 @@ class router
            $loadedLangs[] = $langFile;
        }

+        /* Merge from the db lang. */
+        if($moduleName != 'common' and isset($lang->db->custom))
+        {
+            foreach($lang->db->custom as $record)
+            {
+               if($moduleName == $record->module) 
+                {
+                    if(!$record->key) continue;
+                    $lang->{$record->module}->{$record->section}[$record->key] = $record->value;
+                }
+            }
+        }
+
        $this->lang = $lang;
        return $lang;
    }