From 7ca02f50d0259e15d6b66e600c2fc1b2f7622c8a Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 14 Mar 2008 12:20:50 +0000 Subject: [PATCH] msgPool git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9833 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../gofax/gofax/blocklists/class_blocklistGeneric.inc | 8 ++++---- .../gofax/gofax/blocklists/class_blocklistManagement.inc | 4 ++-- .../gofax/gofax/blocklists/class_divListBlocklists.inc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc index 0ea12925a..cb54b7b23 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc @@ -119,7 +119,7 @@ class blocklistGeneric extends plugin if (tests::is_phone_nr($_POST['number']) || preg_match ("/^[\/0-9 ()\^\.\$+*-]+$/",$_POST['number'])){ $this->addNumber ($_POST['number']); } else { - msg_dialog::display(_("Error"), _("Phone number is not valid!"), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::invalid(_("Phone number")), ERROR_DIALOG); } } @@ -204,17 +204,17 @@ class blocklistGeneric extends plugin /* check syntax: must cn */ if ($this->cn == ""){ - $message[]= _("Name is empty!"); + $message[]= msgPool::required(_("Name")); } else { if (!tests::is_uid($this->cn)){ - $message[]= _("Name contains invalid characters!"); + $message[]= msgPool::invalid(_("Name")); } if ($this->dn == 'new'){ $ldap= $this->config->get_ldap_link(); $ldap->cd (get_ou('blocklistou').$this->config->current["BASE"]); $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))(cn=".$this->cn."))", array("cn")); if ($ldap->count() != 0){ - $message[]= _("Name is already in use!"); + $message[]= msgPool::duplicated(_("Name")); } } } diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc index d75b2993d..1dc426fe1 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc @@ -243,7 +243,7 @@ class blocklist extends plugin $this->dialog->delete(); $this->dialog = NULL; } else { - msg_dialog::display(_("Permission error"), sprintf(_("You have not permission to delete '%s'!"), $dn), ERROR_DIALOG); + msg_dialog::display(_("Permission error"), msgPool::permDelete(), $dn), ERROR_DIALOG); } /* Remove lock file after successfull deletion */ del_lock ($dn); @@ -301,7 +301,7 @@ class blocklist extends plugin $this->dialog = NULL; del_lock ($this->dn); } else { - msg_dialog::display(_("Permission error"), _("You have not permission to delete this entry!"), ERROR_DIALOG); + msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG); } } diff --git a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc index af4ed73b2..90385ff70 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc @@ -263,8 +263,8 @@ class divListBlocklist extends MultiSelectWindow } $num_objs = count($list); - $num_obj_str = _("Number of listed blocklists"); - $num_dep_str = _("Number of listed departments"); + $num_obj_str = sprintf(_("Number of listed %s"),_("blocklists")); + $num_dep_str = sprintf(_("Number of listed %s"),_("departments")); $str = "".$num_obj_str." ".$num_objs."    "; -- 2.30.2