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 ed89fdcf8a3ecb4cf6a2e6cfe799103519893868..0869511e078b10aad7b3ff09ba34a910790de429 100755 (executable)
--- 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 d515328546dc2d6156f9bf35b8506f45daffc8af..a5710b20257a77fb3f65f78b4d7ffdb6b3dd458d 100644 (file)
--- 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);