![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bac1a7b)
raw | patch | inline | side by side (parent: bac1a7b)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Fri, 14 Sep 2007 13:10:02 +0000 (13:10 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Fri, 14 Sep 2007 13:10:02 +0000 (13:10 +0000) |
Updated language selectbox
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7297 594d385d-05f5-0310-b6e9-bd551577e9d8
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7297 594d385d-05f5-0310-b6e9-bd551577e9d8
12 files changed:
diff --git a/include/functions.inc b/include/functions.inc
index 27eac9098d4639d1ad0c9f1ff9d4c256a432f235..7bf69aaf36da8f402d9057f2403523cd5119b245 100644 (file)
--- 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);
index 4e4b35ca600d56901a08ac7bd551e005ccbd154d..4c8110e9c47850784f354627f76f20ec5aff1ad8 100644 (file)
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 2e55d84614663bd111150d490cbc490e68a7d75c..38fe1ddbf46607fdfd5126ef5687bc3eaea0b1a9 100644 (file)
$pwd_acl = $ui->get_permissions($val['dn'],"terminal/termgeneric","gotoRootPasswd");
}
if(preg_match("/w/",$pwd_acl)){
- $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."' name='system_setpwd_%KEY%' title='"._("Set root password")."'>";
+ $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."' name='system_setpwd_%KEY%' title='"._("Set root password")."'>";
}else{
$action2 = $empty;
}
diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 2c1c65dbe5b2c2164d014acdc1c6a137909d11d5..efbb3f1f7f525d6fd90dedb104330127d4b71d76 100644 (file)
$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 9f772281ee8189be45acd7775f8846dadee6975e..590a59a5e17973e0d6396b37b7f5fb41619ca429 100644 (file)
*/
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);
}
$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 a691ffc77030c1c2628fce8e4c3392a32f77f4d1..ec5a99bb2193749e11faa19e09d28a3a412226bb 100644 (file)
/* 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);
}
index 5cefbabe46d71cea5011d2190722aa81658dc159..4bb67203e03328a03c7b48a7e67a3902b6019120 100644 (file)
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 30e90a744f5f28b04ff32bb0aee27a35b2b3d649..4812f8d97e091812ca4373d2eb3a54370a29c2e7 100644 (file)
}
}
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.")));
}
}
index 5856eeef53630b9aeea10c6187117162d508649c..9b91a0b89292f6ede0a030702d33bdee3877b439 100644 (file)
$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 95eb474aa2cda206f8348e727929de25f267aee4..b617ca5cb984792317cba190214b8e7f07f3676e 100644 (file)
/* 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);
index 489570e868ab1d4c4f07f31d4c19e420bed56597..057c87fee1b473dc50a53dabfe17676ae14e2e14 100644 (file)
$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 */
index fd94caf3db60efdb8b26e2d2388d0efc10b14693..287603025eb7ec65b97f48dd28df9e04ce6fafb5 100644 (file)
/* Preset display */
$display = "";
$lock_msg = "";
-
+$cca ++;
if (!$remove_lock){
/* Reset requested? */
if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) ||