Recreate navigation strings, if langauage has changed

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 987fa0f21dabcd0947abe4aa18553e07e222ad3b..3b2fe43aad3413ad9bfb566c6c2747ac43d24c96 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -150,6 +150,8 @@ class setup
     $str = "";
     foreach($this->o_steps as $key => $step){
 
+      $step -> update_strings();
+
       $s_title    = $step -> get_title();
       $s_info     = $step -> get_small_info();
       $b_active   = $step -> is_active();

diff --git a/setup/class_setupStep1.inc b/setup/class_setupStep1.inc
index 8724548f9b0897ff4b7ce9019335fcb78a90f4c7..cffd352660d87696231afaf1fbdecba68e6dca1b 100644 (file)
--- a/setup/class_setupStep1.inc
+++ b/setup/class_setupStep1.inc
@@ -32,7 +32,12 @@ class setup_step_1 extends setup_step
 
     $this->is_enabled = TRUE;
     $this->is_active  = TRUE;
-    
+   
+    $this->update_strings(); 
+  }
+
+  function update_strings()
+  {
     $this->s_title      = _("Language selection");
     $this->s_title_long = _("Please choose a language");
     $this->s_info       = _("This step is allows you to define your prefered language.");

diff --git a/setup/class_setupStep2.inc b/setup/class_setupStep2.inc
index 3e68f5a62db5a1fdd810aaf3a76b1b6556893737..fb87801455ff6cb54ef7bdaaae4a152c4269bfde 100644 (file)
--- a/setup/class_setupStep2.inc
+++ b/setup/class_setupStep2.inc
@@ -27,12 +27,18 @@ class setup_step_2 extends setup_step
   var $is_writeable = array();
 
   function setup_step_2()
+  {
+    $this->update_strings();
+  }
+ 
+
+  function update_strings()
   {
     $this->s_title      = _("Installation check");
     $this->s_title_long = _("Basic installation checks");
     $this->s_info       = _("Some basic checks for PHP version, ldap extension...");
   }
- 
+  
   
   /* Execute and display template */ 
   function execute()

diff --git a/setup/class_setupStep3.inc b/setup/class_setupStep3.inc
index 8147706471e5a6df9cc72d894a142e66ba903046..0912abcc458eb3c234c81aac9d5de7f14e8f2bcf 100644 (file)
--- a/setup/class_setupStep3.inc
+++ b/setup/class_setupStep3.inc
@@ -27,10 +27,8 @@ class setup_step_3 extends setup_step
 
   function setup_step_3()
   {
-    $this->s_title      = _("License");
-    $this->s_title_long = _("GNU / GPL-License");
-    $this->s_info       = _("GNU / GPL-License");
-      
+    $this->update_strings();
+
     if(!file_exists("../setup/license.txt")){
       $this->License = "<font color='red'>License not found. Setup stops here.</font>";
     }else{
@@ -42,6 +40,15 @@ class setup_step_3 extends setup_step
       $this->license_found = true;
     }
   }
+
+
+  function update_strings()
+  {
+    $this->s_title      = _("License");
+    $this->s_title_long = _("GNU / GPL-License");
+    $this->s_info       = _("GNU / GPL-License");
+  }
+
  
   function execute()
   {

diff --git a/setup/class_setupStep4.inc b/setup/class_setupStep4.inc
index a67944be01770e9a0dcbdfdc19f0557f7b42f286..69a2ba8633f7c746c2c97af8acc31f2ef8b0a8b6 100644 (file)
--- a/setup/class_setupStep4.inc
+++ b/setup/class_setupStep4.inc
@@ -38,12 +38,19 @@ class setup_step_4 extends setup_step
   var $attributes = array("connection","location","admin","password","base","tls");
 
   function setup_step_4()
+  {
+    $this->update_strings();
+  }
+
+  
+  function update_strings()
   {
     $this->s_title      = _("Ldap settings");
     $this->s_title_long = _("Ldap connection setup");
     $this->s_info       = _("This dialog allows the basic configuration of GOsa's behaviour and properties in your main configuration.");
   }
   
+  
   function execute()
   {
     $smarty = get_smarty();

diff --git a/setup/class_setupStep5.inc b/setup/class_setupStep5.inc
index bff22d5a30815ffb431bb5f94cb3d05bef4d0124..01d6ed167c20db7323a6654cd55cbe5ca67af0fe 100644 (file)
--- a/setup/class_setupStep5.inc
+++ b/setup/class_setupStep5.inc
@@ -51,9 +51,7 @@ class setup_step_5 extends setup_step
 
   function setup_step_5()
   {
-    $this->s_title      = _("GOsa settings 1/3");
-    $this->s_title_long = _("GOsa generic settings, page 1/3");
-    $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
+    $this->update_strings();
 
     $tmp = @passwordMethod::get_available_methods_if_not_loaded();
     foreach($tmp['name'] as $name){
@@ -65,6 +63,14 @@ class setup_step_5 extends setup_step
     }
   }
 
+
+  function update_strings()
+  {
+    $this->s_title      = _("GOsa settings 1/3");
+    $this->s_title_long = _("GOsa generic settings, page 1/3");
+    $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
+  }
+
   
   function execute()
   {

diff --git a/setup/class_setupStep6.inc b/setup/class_setupStep6.inc
index eb25438a7e7ac3c0ceccf6364e47d794717aaec3..c9c61ec31333a90138809f8e76137ecbfef3365c 100644 (file)
--- a/setup/class_setupStep6.inc
+++ b/setup/class_setupStep6.inc
@@ -48,13 +48,19 @@ class setup_step_6 extends setup_step
   var $attributes = array("strict","governmentmode","sambaidmapping","account_expiration");
 
   function setup_step_6()
+  {
+    $this->update_strings();
+  }
+
+ 
+  function update_strings()
   {
     $this->s_title      = _("GOsa settings 2/3");
     $this->s_title_long = _("GOsa generic settings, page 2/3");
     $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
   }
 
-  
+ 
   function execute()
   {
     /* Update snapshot values, with already collected values */

diff --git a/setup/class_setupStep6a.inc b/setup/class_setupStep6a.inc
index 69463a0da4f6d58030c34ea19a38bcc406d7185c..35f9816155ca357ac9061d8ac69b058a751430a3 100644 (file)
--- a/setup/class_setupStep6a.inc
+++ b/setup/class_setupStep6a.inc
@@ -40,13 +40,19 @@ class setup_step_6a extends setup_step
 
 
   function setup_step_6a()
+  {
+    $this->update_strings();
+  }
+
+
+  function update_strings()
   {
     $this->s_title      = _("GOsa settings 3/3");
     $this->s_title_long = _("GOsa generic settings, page 3/3");
     $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
   }
-
   
+
   function execute()
   {
     $smarty = get_smarty();

diff --git a/setup/class_setupStep7.inc b/setup/class_setupStep7.inc
index cea3655633c4828469c6f923d79d3bb9852a7656..38ea41139697f2bab02e0f3b716137c14203749c 100644 (file)
--- a/setup/class_setupStep7.inc
+++ b/setup/class_setupStep7.inc
@@ -31,6 +31,12 @@ class setup_step_7 extends setup_step
   var $samba_version       = 3;
 
   function setup_step_7()
+  {
+    $this->update_strings();
+  }
+
+  
+  function update_strings()
   {
     $this->s_title      = _("Ldap schema check");
     $this->s_title_long = _("Ldap schema check");

diff --git a/setup/class_setupStep8.inc b/setup/class_setupStep8.inc
index 14d5600a1305b17f6fd4ca7043277f06a0000178..822940453d043f7fe692f7fd8747538fdfab2050 100644 (file)
--- a/setup/class_setupStep8.inc
+++ b/setup/class_setupStep8.inc
@@ -28,6 +28,12 @@ class setup_step_8 extends setup_step
   var $last_backup_name = "";
 
   function setup_step_8()
+  {
+    $this->update_strings();
+  }
+
+  
+  function update_strings()
   {
     $this->s_title      = _("Configuration file");
     $this->s_info       = _("In this step the configuration file will be created.");