msgPool

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9833 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
index 0ea12925a243bf00a5ddec9d87b302fd3916d74a..cb54b7b233945b07caea5a097b12212c08fca4a7 100644 (file)
--- 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 d75b2993dc941d3aac7b5b5845d2e1141c899a72..1dc426fe1b97664f351ef7a32f41f150c24204ec 100644 (file)
--- 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 af4ed73b2d410c658baf47933311cbe45b84218d..90385ff704132da23cdd1e71fc25745ee4f66aef 100644 (file)
--- 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 = "<img class='center' src='images/list_blocklist.png'
               title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";