sprintf() without translation

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@98 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2007-07-10 13:51:06 +00:00
parent ae372aabba
commit 5be219fbd8
2 changed files with 3 additions and 3 deletions

View file

@ -15,7 +15,7 @@ function put_file($match) {
$return = file_get_contents($match[4]);
if ($match[4] == "./lang.inc.php") {
if (!$_SESSION["lang"]) {
$return = str_replace("\tif (\$number === false && \$translation) {\n\t\treturn \$translation; // used in _compile.php\n\t}\n", "", $return);
$return = str_replace("\tif (\$number === false) { // used in _compile.php\n\t\treturn (\$translation ? \$translation : \$idf);\n\t}\n", "", $return);
} elseif (preg_match("~case '$_SESSION[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2)) {
return "$match[1]\nfunction lang(\$ar, \$number) {\n\t$match2[1]\n\treturn \$ar[\$pos];\n}\n$match[5]";
}

View file

@ -108,8 +108,8 @@ function lang($idf = null, $number = null) {
return array_keys($translations);
}
$translation = $translations[$LANG][$idf];
if ($number === false && $translation) {
return $translation; // used in _compile.php
if ($number === false) { // used in _compile.php
return ($translation ? $translation : $idf);
}
$args = func_get_args();
if (is_array($translation) && $translation) {