summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0674fac)
raw | patch | inline | side by side (parent: 0674fac)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 13 Mar 2008 12:03:34 +0000 (12:03 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 13 Mar 2008 12:03:34 +0000 (12:03 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9735 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index 220656f8a9c281b8940a7c14dd214029019cf2ee..37be8ef4f8abe9cd3d29c57af8a80d2f764e75d5 100644 (file)
/* set Page header */
$this->AddHeader(array("string"=> $chk, "attach"=>"style='width:20px;'"));
$this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'"));
- $this->AddHeader(array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''"));
+ $this->AddHeader(array("string" => _("Object group")." / "._("Department"), "attach" => "style=''"));
$this->AddHeader(array("string" => _("Properties"), "attach" => "style='width:136px;'"));
$this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
/* Text ,Value ,Name ,Is selected */
- $this->AddCheckBox("UserGroups" , _("Select to see groups containing users") , _("Show groups containing users"), true);
- $this->AddCheckBox("GroupGroups" , _("Select to see groups containing groups") , _("Show groups containing groups"), true);
- $this->AddCheckBox("ApplicationGroups", _("Select to see groups containing applications"), _("Show groups containing applications"), true);
- $this->AddCheckBox("DepartmentGroups" , _("Select to see groups containing departments") , _("Show groups containing departments"), true);
- $this->AddCheckBox("ServerGroups" , _("Select to see groups containing servers") , _("Show groups containing servers"), true);
- $this->AddCheckBox("WorkstationGroups", _("Select to see groups containing workstations"), _("Show groups containing workstations"), true);
- $this->AddCheckBox("WindowsGroups", _("Select to see groups containing windows workstations"), _("Show groups containing windows workstations"), true);
- $this->AddCheckBox("TerminalGroups" , _("Select to see groups containing terminals") , _("Show groups containing terminals"), true);
- $this->AddCheckBox("PrinterGroups" , _("Select to see groups containing printer") , _("Show groups containing printer"), true);
- $this->AddCheckBox("PhoneGroups" , _("Select to see groups containing phones") , _("Show groups containing phones"), true);
+ $str1 = _("Select to see groups containing '%s'.");
+ $str2 = _("Show groups containing '%s'");
+ $this->AddCheckBox("UserGroups" , sprintf($str1, _("Users")),
+ sprintf($str2, _("Users")), true);
+ $this->AddCheckBox("GroupGroups" , sprintf($str1, _("Groups")),
+ sprintf($str2, _("Groups")), true);
+ $this->AddCheckBox("ApplicationGroups", sprintf($str1, _("Applications")),
+ sprintf($str2, _("Applications")), true);
+ $this->AddCheckBox("DepartmentGroups" , sprintf($str1, _("Departments")),
+ sprintf($str2, _("Departments")), true);
+ $this->AddCheckBox("ServerGroups" , sprintf($str1, _("Server")),
+ sprintf($str2, _("Server")), true);
+ $this->AddCheckBox("WorkstationGroups", sprintf($str1, _("Workstations")),
+ sprintf($str2, _("Workstations")), true);
+ $this->AddCheckBox("WindowsGroups", sprintf($str1, _("Windows workstations")),
+ sprintf($str2, _("Windows workstations")), true);
+ $this->AddCheckBox("TerminalGroups" , sprintf($str1, _("Terminals")),
+ sprintf($str2, _("Terminals")), true);
+ $this->AddCheckBox("PrinterGroups" , sprintf($str1, _("Printer")),
+ sprintf($str2, _("Printer")), true);
+ $this->AddCheckBox("PhoneGroups" , sprintf($str1, _("Phones")),
+ sprintf($str2, _("Phones")), true);
/* Add SubSearch checkbox */
$this->AddCheckBox(SEPERATOR);
src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
}else{
$actions.= "<img class='center' src='images/empty.png' alt=' '
- title='"._("You are not allowed to remove this entry.")."'>";
+ title='".msgPool::permDelete()."'>";
}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 65fc6e74b1c9450e45d84a752049636790a71979..bfd86e1014432351c8fd5f6ef4737a2c3a66b68b 100644 (file)
/* Do we represent a valid group? */
if (!$this->is_account){
$display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\"> <b>".
- _("This 'dn' is no object group.")."</b>";
+ msgPool::noValidExtension("object group")."</b>";
return ($display);
}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index b1d139436f5ee7d949cd379438571ed8c7131540..51193a32ff7fb9b16ac11edaf6987ac723b6e49f 100644 (file)
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
/* Remove lock file after successfull deletion */
/* Obviously the user isn't allowed to delete. Show message and
clean session. */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
}
}
/* Normally this shouldn't be reached, send some extra
logs to notify the administrator */
- msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), INFO_DIALOG);
+ msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
}
"S" => array("select_server.png" ,_("Server") , "ogroup"),
"F" => array("select_phone.png" ,_("Phone") , "phonequeue"),
"W" => array("select_workstation.png" ,_("Workstation") , "workstartup"),
- "O" => array("select_winstation.png" ,_("Windows Install") , "ogroup"),
+ "O" => array("select_winstation.png" ,_("Windows Install") , "ogroup"),
"T" => array("select_terminal.png" ,_("Terminal") , "termgroup"),
"P" => array("select_printer.png" ,_("Printer") , "ogroup"));