Use LANG instead of get_lang()

diff --git a/compile.php b/compile.php
index c1afeeb0d502a0f91d731582872d4224fd044fb6..fc5c44da55137ae8d9fea52497c029be4339ccd5 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -102,9 +102,7 @@ function put_file($match) {
                return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? "<?php" : "");
        } elseif (preg_match('~\s*(\$pos = (.+\n).+;)~sU', $return, $match2)) {
                // single language lang() is used for plural
-               return "function get_lang() {
-       return '$_SESSION[lang]';
-}
+               return "define('Adminer\\LANG', '$_SESSION[lang]');
 
 function lang(\$translation, \$number = null) {
        if (is_array(\$translation)) {

diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php
index 314b1bc613b4c3dd76c4d3bf3bde15c28c39fc93..af6b45771ca95adfacdd169123931a48a301e4d8 100644 (file)
--- a/plugins/edit-calendar.php
+++ b/plugins/edit-calendar.php
@@ -28,7 +28,7 @@ class AdminerEditCalendar {
                        . Adminer\script_src("jquery-ui/jquery-ui-timepicker-addon.js")
                );
                if ($this->langPath) {
-                       $lang = Adminer\get_lang();
+                       $lang = Adminer\LANG;
                        $lang = ($lang == "zh" ? "zh-CN" : ($lang == "zh-tw" ? "zh-TW" : $lang));
                        if ($lang != "en" && file_exists(sprintf($this->langPath, $lang))) {
                                echo Adminer\script_src(sprintf($this->langPath, $lang));

diff --git a/plugins/tinymce.php b/plugins/tinymce.php
index 440ce7bac4244e72ee3270b65f0e07b1d0a4c2c4..8f12fc9bf51648745cebebcd77884338ad1e35b1 100644 (file)
--- a/plugins/tinymce.php
+++ b/plugins/tinymce.php
@@ -15,7 +15,7 @@ class AdminerTinymce {
        }
 
        function head($dark = null) {
-               $lang = Adminer\get_lang();
+               $lang = Adminer\LANG;
                $lang = ($lang == "zh" ? "zh-cn" : ($lang == "zh-tw" ? "zh" : $lang));
                if (!file_exists(dirname($this->path) . "/langs/$lang.js")) {
                        $lang = "en";

diff --git a/plugins/translation.php b/plugins/translation.php
index dc78b62c20752214d63af90f1332ab1dd85bf7eb..77d09e37d2cfe0ff73a88d4c0a6bac49ce426f06 100644 (file)
--- a/plugins/translation.php
+++ b/plugins/translation.php
@@ -21,7 +21,7 @@ class AdminerTranslation {
        private function translate($idf) {
                static $translations, $lang;
                if ($lang === null) {
-                       $lang = Adminer\get_lang();
+                       $lang = Adminer\LANG;
                }
                if ($idf == "" || $lang == "en") {
                        return $idf;