fix 2nd lang file detecting

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@134 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
17 years ago · adfe2d20ad
parent 47e7def006
commit adfe2d20ad
2 changed files with 12 additions and 2 deletions
--- a/admin/common.php
+++ b/admin/common.php
@ -25,7 +25,12 @@ function get_language_file($name)
 	global $charset, $lang;
 	$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'])) {
 		foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $l) {
--- a/coverager/common.php
+++ b/coverager/common.php
@ -25,7 +25,12 @@ function get_language_file($name)
 	global $charset, $lang;
 	$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'])) {
 		foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $l) {