sprintf() without translation

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@98 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/_compile.php b/_compile.php
index 7746590dff4d3720c8f5d0867646979bf9a88e84..4193a35ff4c38299ad5d228b000e27ab997d3feb 100644 (file)
--- a/_compile.php
+++ b/_compile.php
@@ -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]";
                }

diff --git a/lang.inc.php b/lang.inc.php
index 8177528f9a53e306edf1fc372429b0a06ea9e0ec..11b027d01418eb459082bcab815e78ea5b9afa9a 100644 (file)
--- a/lang.inc.php
+++ b/lang.inc.php
@@ -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) {