From 2b88b5f1262945636c708f2e85f1ba07293fc54e Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 14 Sep 2007 13:10:02 +0000 Subject: [PATCH] translation fixes. Updated language selectbox git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7297 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/functions.inc | 17 +++++++++++++++-- plugins/admin/fai/class_faiScript.inc | 3 ++- plugins/admin/systems/class_divListSystem.inc | 2 +- plugins/admin/systems/class_phoneGeneric.inc | 2 +- plugins/admin/systems/class_printGeneric.inc | 6 +++--- .../admin/systems/class_printerPPDDialog.inc | 2 +- plugins/admin/systems/class_servKolab.inc | 2 +- .../admin/systems/class_systemManagement.inc | 2 +- plugins/admin/systems/class_termDNS.inc | 2 +- plugins/gofax/faxaccount/class_gofaxAccount.inc | 3 ++- plugins/personal/generic/class_user.inc | 2 +- plugins/personal/generic/main.inc | 2 +- 12 files changed, 30 insertions(+), 15 deletions(-) diff --git a/include/functions.inc b/include/functions.inc index 27eac9098..7bf69aaf3 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -2404,17 +2404,30 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA "sv_SE" => "Swedish", "zh_CN" => "Chinese", "ru_RU" => "Russian"); + + $tmp2= array( + "de_DE" => _("German"), + "fr_FR" => _("French"), + "it_IT" => _("Italian"), + "es_ES" => _("Spanish"), + "en_US" => _("English"), + "nl_NL" => _("Dutch"), + "pl_PL" => _("Polish"), + "sv_SE" => _("Swedish"), + "zh_CN" => _("Chinese"), + "ru_RU" => _("Russian")); $ret = array(); if($languages_in_own_language){ + $old_lang = setlocale(LC_ALL, 0); foreach($tmp as $key => $name){ $lang = $key.".UTF-8"; setlocale(LC_ALL, $lang); if($strip_region_tag){ - $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$name.")"; + $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$tmp2[$key].")"; }else{ - $ret[$key] = _($name)."  (".$name.")"; + $ret[$key] = _($name)."  (".$tmp2[$key].")"; } } setlocale(LC_ALL, $old_lang); diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 4e4b35ca6..4c8110e9c 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -315,7 +315,8 @@ class faiScript extends plugin Containing FAIscripts */ $divlist = new divlist("FAIscripts"); - +# $divlist->SetEntriesPerPage(0); + $divlist->SetPluginMode(); $plug = $_GET['plug']; if($this->sort_order == "up"){ diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 2e55d8461..38fe1ddbf 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -377,7 +377,7 @@ class divListSystem extends MultiSelectWindow $pwd_acl = $ui->get_permissions($val['dn'],"terminal/termgeneric","gotoRootPasswd"); } if(preg_match("/w/",$pwd_acl)){ - $action2 = ""; + $action2 = ""; }else{ $action2 = $empty; } diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 2c1c65dbe..efbb3f1f7 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -265,7 +265,7 @@ class phoneGeneric extends plugin $ldap->search ("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))", array("uid","cn")); while ($attr = $ldap->fetch()){ - print_red(sprintf(_("Can't delete because there are user which are depending on this phone. One of them is user '%s'."), + print_red(sprintf(_("Can't delete because there are users which are depending on this phone. One of them is user '%s'."), ($attr['uid'][0]." - ".$attr['cn'][0]))); return; } diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 9f772281e..590a59a5e 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -264,7 +264,7 @@ class printgeneric extends plugin */ if(preg_match("/unknown/i",$this->BelongsTo)){ $display= $this->show_enable_header(_("Add printer extension"), - _("Could not intialize printer tab, parameter parent was missing while construction."),TRUE,TRUE); + _("Could not initialize printer tab, parameter parent was missing while construction."),TRUE,TRUE); return($display); } @@ -520,10 +520,10 @@ class printgeneric extends plugin $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD)); } }else{ - $smarty->assign("driverInfo", _("not defined")); + $smarty->assign("driverInfo", _("Not defined")); } }else{ - $smarty->assign("driverInfo",_("can't get ppd informations.")); + $smarty->assign("driverInfo",_("Can't get ppd informations.")); } /* Create user & admin user list */ diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc index a691ffc77..ec5a99bb2 100644 --- a/plugins/admin/systems/class_printerPPDDialog.inc +++ b/plugins/admin/systems/class_printerPPDDialog.inc @@ -250,7 +250,7 @@ class printerPPDDialog extends plugin /* Check if parse was successfull */ if(empty($name) || empty($vendor)){ - print_red(sprintf(_("The given ppd file '%s' seams to be invalid, can't get any modell or vendor informations."),$_PathOnHdd)); + print_red(sprintf(_("The given ppd file '%s' seams to be invalid, can't get any model or vendor informations."),$_PathOnHdd)); return(false); } diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index 5cefbabe4..4bb67203e 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -182,7 +182,7 @@ class servkolab extends goService { return; } - /* Integration check, not translatet because they can't pop up at all, only for debug */ + /* Integration check, not translated because they can't pop up at all, only for debug */ if(count($this->kolabHost) == 0){ print_red("Server - Kolab tab : This is not possible, we can't remove an account which doesn't exists."); return; diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 30e90a744..4812f8d97 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -723,7 +723,7 @@ class systems extends plugin } } if(!$found){ - print_red(sprintf(_("Can't set gotoMode to status 'avtice', the current object couldn't be identified."))); + print_red(sprintf(_("Can't set gotoMode to status 'active', the current object couldn't be identified."))); } } diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc index 5856eeef5..9b91a0b89 100644 --- a/plugins/admin/systems/class_termDNS.inc +++ b/plugins/admin/systems/class_termDNS.inc @@ -439,7 +439,7 @@ class termDNS extends plugin $message= plugin::check(); if($this->dhcpEnabled && $this->dhcp_is_Account && $this->dhcpParentNode != "" && count($this->dhcpHostEntry) == 0){ - $message[] =_("You haven not configured your dhcp settings yet."); + $message[] =_("You have not configured your dhcp settings yet."); } /* Check if ip must be given diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index 95eb474aa..b617ca5cb 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -570,7 +570,8 @@ class gofaxAccount extends plugin /* Show main page */ - $smarty->assign("languages", get_languages()); + $smarty->assign("languages", get_languages(TRUE)); + $smarty->assign("formats", $this->config->data['MAIN']['FAXFORMATS']); $smarty->assign("printers", $this->printerList); diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 489570e86..057c87fee 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -273,7 +273,7 @@ class user extends plugin $sex= array(0 => " ", "F" => _("female"), "M" => _("male")); $smarty->assign("gender_list", $sex); - $language= array_merge(array(0 => " ") ,get_languages()); + $language= array_merge(array(0 => " ") ,get_languages(TRUE)); $smarty->assign("preferredLanguage_list", $language); /* Get random number for pictures */ diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc index fd94caf3d..287603025 100644 --- a/plugins/personal/generic/main.inc +++ b/plugins/personal/generic/main.inc @@ -22,7 +22,7 @@ /* Preset display */ $display = ""; $lock_msg = ""; - +$cca ++; if (!$remove_lock){ /* Reset requested? */ if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) || -- 2.30.2