diff --git a/livesupport/src/modules/htmlUI/var/ui_base.inc.php b/livesupport/src/modules/htmlUI/var/ui_base.inc.php index ec77dd0b3..124a58871 100644 --- a/livesupport/src/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/src/modules/htmlUI/var/ui_base.inc.php @@ -42,12 +42,14 @@ function _getLanguages() */ function tra($input) { - ## initialize at first call of this function ### - - #$GS =& $_SESSION[UI_LOCALIZATION_SESSNAME]['GS']; - static $GS; global $uiBase; + if (UI_LOCALIZER_SESSNAME) { + $GS =& $_SESSION[UI_LOCALIZATION_SESSNAME]['GS']; + } else { + static $GS; + } + if ($uiBase->langid && !is_array($GS)) { #echo "load translation"; include_once dirname(__FILE__).'/localizer/loader.inc.php'; diff --git a/livesupport/src/modules/htmlUI/var/ui_conf.php b/livesupport/src/modules/htmlUI/var/ui_conf.php index 7b9a49785..ec39dce5d 100644 --- a/livesupport/src/modules/htmlUI/var/ui_conf.php +++ b/livesupport/src/modules/htmlUI/var/ui_conf.php @@ -2,9 +2,16 @@ ini_set('memory_limit', '64M'); define('UI_PL_DRAG_ENABLED', TRUE); -define('UI_PL_DRAG_INTRO', 'Here you can simply rearrange whole playlist on just drag items up or down.'); -define('UI_VERSION', 'LiveSupport 1.0.1'); -define('UI_VERSION_FULLNAME', 'LiveSupport 1.0 stable'); +define('UI_LOCALIZER_SESSNAME', 'LOCALIZER'); + +## Warning/Error level +define('UI_VERBOSE', FALSE); +define('UI_WARNING', TRUE); +define('UI_ERROR', TRUE); + +## Misc +define('UI_VERSION', 'LiveSupport 1.0.2'); +define('UI_VERSION_FULLNAME', 'LiveSupport 1.0.2'); define('UI_TESTSTREAM_MU3_TMP', 'img/test.m3u'); ## Scheduler diff --git a/livesupport/src/modules/htmlUI/var/ui_conf.php.template b/livesupport/src/modules/htmlUI/var/ui_conf.php.template index f30aef28e..7263b23fb 100644 --- a/livesupport/src/modules/htmlUI/var/ui_conf.php.template +++ b/livesupport/src/modules/htmlUI/var/ui_conf.php.template @@ -1,23 +1,23 @@ /tmp/scheduler.log 2>&1 &'); ## adjust the start-command here define('UI_SCHEDULER_DAEMON_NAME', 'scheduler'); ## this is name of scheduler process to grep in process list for it -## Warning/Error level -define('UI_VERBOSE', FALSE); -define('UI_WARNING', TRUE); -define('UI_ERROR', TRUE); ## Local settings define('UI_DEFAULT_LANGID', 'en_GB');