Index: trunk/htdocs/common/common.php
===================================================================
--- trunk/htdocs/common/common.php	(revision 1090)
+++ trunk/htdocs/common/common.php	(revision 1099)
@@ -86,5 +86,5 @@
 }
 
-function get_language_file_ex($name, $lang)
+function get_language_file_ex($dir, $lang)
 {
 	static $langMap = array(
@@ -101,5 +101,5 @@
 	}
 
-	$file = "$name-$lang.lang.php";
+	$file = "$dir/$lang.php";
 	if (file_exists($file)) {
 		return $file;
@@ -108,13 +108,13 @@
 }
 
-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,5 +125,5 @@
 			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,5 +131,5 @@
 				}
 				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,5 +140,5 @@
 		}
 	}
-	return isset($file) ? $file : "$name-en.lang.php";
+	return isset($file) ? $file : "$dir/en.php";
 }
 
@@ -261,5 +261,5 @@
 
 $strings = array();
-include get_language_file("../common/common");
+include get_language_file("../common/lang");
 
 $modules = array();