Flatten $translations

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

diff --git a/_compile.php b/_compile.php
index f0ef9344e591f633553d4043ebdb47d64f961dbf..d060c48bdd9b0cfda9cca31d2e515a850dfbf253 100644 (file)
--- a/_compile.php
+++ b/_compile.php
@@ -4,9 +4,9 @@ function add_apo_slashes($s) {
 }
 
 function remove_lang($match) {
-       global $LANG, $translations;
+       global $translations;
        $idf = strtr($match[2], array("\\'" => "'", "\\\\" => "\\"));
-       $s = ($translations[$LANG][$idf] ? $translations[$LANG][$idf] : $idf);
+       $s = ($translations[$idf] ? $translations[$idf] : $idf);
        if ($match[3] == ",") {
                return "$match[1]" . (is_array($s) ? "lang(array('" . implode("', '", array_map('add_apo_slashes', $s)) . "')," : "sprintf('" . add_apo_slashes($s) . "',");
        }
@@ -15,14 +15,14 @@ function remove_lang($match) {
 
 function put_file($match) {
        if ($match[4] == './lang/$LANG.inc.php') {
-               $return = "";
-               if (!$_COOKIE["lang"]) {
-                       foreach (glob("./lang/*.inc.php") as $filename) {
-                               $match[4] = $filename;
-                               $return .= put_file($match);
-                       }
+               if ($_COOKIE["lang"]) {
+                       return "";
                }
-               return $return;
+               $return = "switch (\$LANG) {\n";
+               foreach (glob("./lang/*.inc.php") as $filename) {
+                       $return .= "case '" . basename($filename, '.inc.php') . "': " . substr(file_get_contents($filename), 6) . "break;\n";
+               }
+               return "$return}\n";
        }
        $return = file_get_contents($match[4]);
        if ($match[4] == "./lang.inc.php" && $_COOKIE["lang"] && (preg_match("~case '$_COOKIE[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2))) {
@@ -45,17 +45,15 @@ error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
        $_COOKIE["lang"] = $_SERVER["argv"][1];
        include "./lang.inc.php";
-       if ($_SERVER["argc"] != 2 || !isset($translations[$_COOKIE["lang"]])) {
+       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
                echo "Usage: php _compile.php [lang]\nPurpose: Compile phpMinAdmin[-lang].php from index.php.\n";
                exit(1);
        }
        include "./lang/$_COOKIE[lang].inc.php";
 }
-$filename = "phpMinAdmin.php";
+
+$filename = "phpMinAdmin" . ($_COOKIE["lang"] ? "-$_COOKIE[lang]" : "") . ".php";
 $file = file_get_contents("index.php");
-if ($_COOKIE["lang"]) {
-       $filename = "phpMinAdmin-$_COOKIE[lang].php";
-}
 $file = preg_replace_callback('~(<\\?php)?\\s*(include|require)(_once)? "([^"]*)";(\\s*\\?>)?~', 'put_file', $file);
 if ($_COOKIE["lang"]) {
        $file = preg_replace_callback("~(<\\?php\\s*echo )?lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])(;\\s*\\?>)?~s", 'remove_lang', $file);

diff --git a/_lang.php b/_lang.php
index aa06f84a91ed6b1fb07c5e6ed9eb25fd29381b33..dcc240eeb7368191184d78c418da1babb67ea29a 100644 (file)
--- a/_lang.php
+++ b/_lang.php
@@ -1,8 +1,9 @@
 <?php
+error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
        $_COOKIE["lang"] = $_SERVER["argv"][1];
        include "./lang.inc.php";
-       if ($_SERVER["argc"] != 2 || !isset($translations[$_COOKIE["lang"]])) {
+       if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
                echo "Usage: php _lang.php [lang]\nPurpose: Update lang.inc.php from source code messages.\n";
                exit(1);
        }
@@ -19,7 +20,7 @@ foreach (glob("*.php") as $filename) {
 foreach (($_COOKIE["lang"] ? array("lang/$_COOKIE[lang].inc.php") : glob("lang/*.inc.php")) as $filename) {
        $messages = $messages_all;
        preg_match_all("~^(\\s*)(?:// )?(('(?:[^\\\\']+|\\\\.)*') => .*[^,\n]),?~m", file_get_contents($filename), $matches, PREG_SET_ORDER);
-       $s = "<?php\n\$translations['" . basename($filename, ".inc.php") . "'] = array(\n";
+       $s = "<?php\n\$translations = array(\n";
        foreach ($matches as $match) {
                if (isset($messages[$match[3]])) {
                        $s .= "$match[1]$match[2],\n";

diff --git a/lang/cs.inc.php b/lang/cs.inc.php
index b21450c294d69f7df49bcae5c7642a0c60b7c440..e8aa544c7f310a075cc6b9703c999464e893af40 100644 (file)
--- a/lang/cs.inc.php
+++ b/lang/cs.inc.php
@@ -1,5 +1,5 @@
 <?php
-$translations['cs'] = array(
+$translations = array(
        'Login' => 'Přihlásit se',
        'phpMinAdmin' => 'phpMinAdmin',
        'Logout successful.' => 'Odhlášení proběhlo v pořádku.',

diff --git a/lang/en.inc.php b/lang/en.inc.php
index b7e81e10afd24ea35fc8622210285708139c713e..da4476698de01342c6d00cce570eff4c8cc3d2b3 100644 (file)
--- a/lang/en.inc.php
+++ b/lang/en.inc.php
@@ -1,5 +1,5 @@
 <?php
-$translations['en'] = array(
+$translations = array(
        'Query executed OK, %d row(s) affected.' => array('Query executed OK, %d row affected.', 'Query executed OK, %d rows affected.'),
        '%d byte(s)' => array('%d byte', '%d bytes'),
        'Routine has been called, %d row(s) affected.' => array('Routine has been called, %d row affected.', 'Routine has been called, %d rows affected.'),

diff --git a/lang/sk.inc.php b/lang/sk.inc.php
index 7621c54738712781e1e871e1c8d77e651a61e6f4..6201c79037876509d8ae745c84df34c59ea9c298 100644 (file)
--- a/lang/sk.inc.php
+++ b/lang/sk.inc.php
@@ -1,5 +1,5 @@
 <?php
-$translations['sk'] = array(
+$translations = array(
        'Login' => 'Prihlásiť sa',
        'phpMinAdmin' => 'phpMinAdmin',
        'Logout successful.' => 'Odhlásenie prebehlo v poriadku',