From: opensides Date: Mon, 8 May 2006 02:34:06 +0000 (+0000) Subject: some more fixes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=127b115ae6feb8442bec8a9c38922a1acfd18997;p=gosa.git some more fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3210 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gen_locale.sh b/gen_locale.sh index ed89fdcf8..0869511e0 100755 --- a/gen_locale.sh +++ b/gen_locale.sh @@ -22,7 +22,7 @@ for template in $(find -name '*.tpl'); do done for class in $(find -name 'class_*.inc'); do - echo -en "\rConverting .tpl files: $(basename $template) \r" + echo -en "\rConverting class_*.inc files: $(basename $template) \r" sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new mv $class.new $class done diff --git a/html/helpviewer.php b/html/helpviewer.php index d51532854..a5710b202 100644 --- a/html/helpviewer.php +++ b/html/helpviewer.php @@ -42,11 +42,8 @@ if ($config->data['MAIN']['LANG'] == ""){ $lang= $config->data['MAIN']['LANG']; } -if(isset($_SESSION['ui']->language)){ - $lang = $_SESSION['ui']->language; -} - $lang.=".UTF-8"; + putenv("LANGUAGE="); putenv("LANG=$lang"); setlocale(LC_ALL, $lang);