From 3a8d865326edc19faa44a8646515397aa670a702 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 10 Jul 2015 08:45:43 +0200 Subject: [PATCH] Fix translation of variables in test mode. --- main/inc/lib/internationalization.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index 0d98e9d74a..6221a36458 100755 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -144,7 +144,7 @@ function get_lang($variable, $reserved = null, $language = null) { // - from a global variable (the faster way) - on production server mode; // - from a local variable after reloading the language files - on test server mode or when requested language // is different than the genuine interface language. - $read_global_variables = $is_interface_language && !$test_server_mode; + $read_global_variables = $is_interface_language; if ($read_global_variables) { if (isset($GLOBALS[$variable])) { @@ -155,13 +155,13 @@ function get_lang($variable, $reserved = null, $language = null) { $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable; } } else { - if (isset($$variable)) { + /*if (isset($$variable)) { $langvar = $$variable; } elseif (isset(${"lang$variable"})) { $langvar = ${"lang$variable"}; } else { $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable; - } + }*/ } if (empty($langvar) || !is_string($langvar)) { $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;