Added chinese to the list of language selections

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6522 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/main.php b/html/main.php
index 1796905bd7bcae5a70b69f20d59814d9b0b0791a..70139695098cb8f437133ffa988213665e0035bf 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -136,6 +136,7 @@ if ($config->data['MAIN']['LANG'] == ""){
 }
 
 $lang.=".UTF-8";
+
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 9749942d5f3942eee64c486f76226f84e081a7d2..8c1b16b0eeb529d01a4c6888c22484421080458e 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -263,7 +263,8 @@ class user extends plugin
     /* Assign prefered langage */
     $language= array(0 => " ", "fr_FR" => ("fr_FR"), "en_EN" => ("en_EN"), 
                                     "de_DE" => ("de_DE"), "it_IT" => ("it_IT"), 
-                                    "nl_NL" => ("nl_NL"), "ru_RU" => ("ru_RU"));
+                                    "nl_NL" => ("nl_NL"), "ru_RU" => ("ru_RU"),
+                                    "zh_CN" => ("zh_CN"));
     $smarty->assign("preferredLanguage_list", $language);
 
     /* Get random number for pictures */

diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 76106ebd04534d97c12f9f102821d8eebe79634b..986c3354251792de7d6930210bf8036a456729b1 100644 (file)
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -48,6 +48,7 @@ class Step_Language extends setup_step
                              "de_DE" => _("German"),
                              "fr_FR" => _("French"),
                              "en_EN" => _("English"),
+                             "zh_CN" => _("Chinese"),
                              "ru_RU" => _("Russian"));
     asort($this->languages);
     $smarty = get_smarty();