Changeset 182

Timestamp:

09/19/2006 02:27:22 AM (7 years ago)

Author:

moo

Message:

recognize gb2312/gbk/gb18030 as gb2312. gb2312 lang file for coverager

Location:

trunk

Files:

• admin/common.php (modified) (1 diff)
• coverager/common-zh-simplified-gb2312.lang.php (added)
• coverager/common.php (modified) (1 diff)

trunk/admin/common.php

@@ -3 +3 @@
 function get_language_file_ex($name, $l, $s)
 {
-    static $map = array(
+    static $lmap = array(
             'zh'    => 'zh-simplified',
             'zh-hk' => 'zh-traditional',
             'zh-tw' => 'zh-traditional',
             );
+    static $smap = array(
+            'gbk'     => 'gb2312',
+            'gb18030' => 'gb2312',
+            );
 
-    if (isset($map[$l])) {
-        $l = $map[$l];
+    if (isset($lmap[$l])) {
+        $l = $lmap[$l];
     }
     if (file_exists($file = "$name-$l-$s.lang.php")) {
         return $file;
+    }
+    if (isset($smap[$s])) {
+        $s = $smap[$s];
+        if (file_exists($file = "$name-$l-$s.lang.php")) {
+            return $file;
+        }
     }
     if (file_exists($file = "$name-$l.lang.php")) {

trunk/coverager/common.php

@@ -3 +3 @@
 function get_language_file_ex($name, $l, $s)
 {
-    static $map = array(
+    static $lmap = array(
             'zh'    => 'zh-simplified',
             'zh-hk' => 'zh-traditional',
             'zh-tw' => 'zh-traditional',
             );
+    static $smap = array(
+            'gbk'     => 'gb2312',
+            'gb18030' => 'gb2312',
+            );
 
-    if (isset($map[$l])) {
-        $l = $map[$l];
+    if (isset($lmap[$l])) {
+        $l = $lmap[$l];
     }
     if (file_exists($file = "$name-$l-$s.lang.php")) {
         return $file;
+    }
+    if (isset($smap[$s])) {
+        $s = $smap[$s];
+        if (file_exists($file = "$name-$l-$s.lang.php")) {
+            return $file;
+        }
     }
     if (file_exists($file = "$name-$l.lang.php")) {