From ab252cabf298ba33319b464e12642c71ef759407 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 4 Apr 2007 08:38:45 +0000 Subject: [PATCH] Recreate navigation strings, if langauage has changed git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5969 594d385d-05f5-0310-b6e9-bd551577e9d8 --- setup/class_setup.inc | 2 ++ setup/class_setupStep1.inc | 7 ++++++- setup/class_setupStep2.inc | 8 +++++++- setup/class_setupStep3.inc | 15 +++++++++++---- setup/class_setupStep4.inc | 7 +++++++ setup/class_setupStep5.inc | 12 +++++++++--- setup/class_setupStep6.inc | 8 +++++++- setup/class_setupStep6a.inc | 8 +++++++- setup/class_setupStep7.inc | 6 ++++++ setup/class_setupStep8.inc | 6 ++++++ 10 files changed, 68 insertions(+), 11 deletions(-) diff --git a/setup/class_setup.inc b/setup/class_setup.inc index 987fa0f21..3b2fe43aa 100644 --- 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 8724548f9..cffd35266 100644 --- 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 3e68f5a62..fb8780145 100644 --- 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 814770647..0912abcc4 100644 --- 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 = "License not found. Setup stops here."; }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 a67944be0..69a2ba863 100644 --- 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 bff22d5a3..01d6ed167 100644 --- 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 eb25438a7..c9c61ec31 100644 --- 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 69463a0da..35f981615 100644 --- 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 cea365563..38ea41139 100644 --- 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 14d5600a1..822940453 100644 --- 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."); -- 2.30.2