Changeset 1099 for trunk/htdocs/common/common.php

Timestamp:

2012-08-01T08:47:18+02:00 (10 months ago)

Author:

moo

Message:

refactor: move lang files to sub folder

File:

• trunk/htdocs/common/common.php (modified) (7 diffs)

trunk/htdocs/common/common.php

@@ -86 +86 @@
 }
 
-function get_language_file_ex($name, $lang)
+function get_language_file_ex($dir, $lang)
 {
     static $langMap = array(
@@ -101 +101 @@
     }
 
-    $file = "$name-$lang.lang.php";
+    $file = "$dir/$lang.php";
     if (file_exists($file)) {
         return $file;
@@ -108 +108 @@
 }
 
-function get_language_file($name)
+function get_language_file($dir)
 {
     global $config;
     if (!empty($config['lang'])) {
         $lang = strtolower($config['lang']);
-        $file = get_language_file_ex($name, $lang);
+        $file = get_language_file_ex($dir, $lang);
         if (!isset($file)) {
             $lang = strtok($lang, ':-');
-            $file = get_language_file_ex($name, $lang);
+            $file = get_language_file_ex($dir, $lang);
         }
     }
@@ -125 +125 @@
             foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $lang) {
                 $lang = strtok($lang, ':;');
-                $file = get_language_file_ex($name, $lang);
+                $file = get_language_file_ex($dir, $lang);
                 if (isset($file)) {
                     $config['lang'] = $lang;
@@ -131 +131 @@
                 }
                 if (strpos($lang, '-') !== false) {
-                    $file = get_language_file_ex($name, strtok($lang, ':-'));
+                    $file = get_language_file_ex($dir, strtok($lang, ':-'));
                     if (isset($file)) {
                         $config['lang'] = $lang;
@@ -140 +140 @@
         }
     }
-    return isset($file) ? $file : "$name-en.lang.php";
+    return isset($file) ? $file : "$dir/en.php";
 }
 
@@ -261 +261 @@
 
 $strings = array();
-include get_language_file("../common/common");
+include get_language_file("../common/lang");
 
 $modules = array();