Changeset 134

Timestamp:

09/04/2006 12:05:19 PM (2 years ago)

Author:

moo

Message:

fix 2nd lang file detecting

Location:

trunk

Files:

• admin/common.php (modified) (1 diff)
• coverager/common.php (modified) (1 diff)

trunk/admin/common.php

@@ -26 +26 @@
     $s = strtolower($charset);
     if (isset($lang)) {
-        $file = get_language_file_ex($name, strtolower($lang), $s);
+        $l = strtolower($lang);
+        $file = get_language_file_ex($name, $l, $s);
+        if (!isset($file)) {
+            $l = strtok($l, '-');
+            $file = get_language_file_ex($name, $l, $s);
+        }
     }
     else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

trunk/coverager/common.php

@@ -26 +26 @@
     $s = strtolower($charset);
     if (isset($lang)) {
-        $file = get_language_file_ex($name, strtolower($lang), $s);
+        $l = strtolower($lang);
+        $file = get_language_file_ex($name, $l, $s);
+        if (!isset($file)) {
+            $l = strtok($l, '-');
+            $file = get_language_file_ex($name, $l, $s);
+        }
     }
     else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {