X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep_Language.inc;h=e1b5e72ab61c11b2487740b8afb5063b924d967f;hb=484c83ff60fc5a427dd9e18be1c504d3dbb6e337;hp=363b9b4df488153d61546a3eac19dedb27a130b8;hpb=2eba5d4da490a3922cd70ddfa6d5642564a624b9;p=gosa.git

diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 363b9b4df..e1b5e72ab 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -26,14 +26,12 @@ class Step_Language extends setup_step
   var $lang           = "en_EN";  /* Detected language */
   var $languages      = array();
   var $attributes     = array("lang","lang_selected");
-  var $header_image   = "images/system.png";
+  var $header_image   = "images/locale.png";
 
   function Step_Language()
   {
     $this->lang           = get_browser_language();
     $this->lang_selected  = "";
-    $this->is_enabled     = TRUE;
-    $this->is_active      = TRUE;
     $this->update_strings(); 
   }
 
@@ -41,22 +39,18 @@ class Step_Language extends setup_step
   {
     $this->s_title      = _("Language setup");
     $this->s_title_long = _("Language setup");
-    $this->s_info       = _("This step is allows you to select your prefered language.");
+    $this->s_info       = _("This step allows you to select your preferred language.");
   }
   
   function execute()
   {
-    $this->languages = array(""      => _("Automatic"),
-                             "de_DE" => _("German"),
-                             "fr_FR" => _("French"),
-                             "en_EN" => _("English"),
-                             "ru_RU" => _("Russian"));
-
+    $this->languages = array_merge(array(""      => _("Automatic")),get_languages(TRUE));
+    asort($this->languages);
     $smarty = get_smarty();
     $smarty->assign("languages",    $this->languages);
     $smarty->assign("lang",         $this->lang);
     $smarty->assign("lang_selected",$this->lang_selected);
-    return($smarty->fetch(get_template_path("setup_step1.tpl",TRUE,dirname(__FILE__))));
+    return($smarty->fetch(get_template_path("setup_language.tpl",TRUE,dirname(__FILE__))));
   }
 
   function save_object()