msgPool

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

diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index eb6bfe944b8d0345c5ee0f94f03d79b032d08d92..e76d4e38645124a79c864fe6655d8272e212b151 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -244,11 +244,9 @@ class department extends plugin
 
                /* All required fields are set? */
                if ($this->ou == ""){
-                       $message[]= _("Required field 'Name' is not set.");
                        $message[]= msgPool::required(_("Name"));
                }
                if ($this->description == ""){
-                       $message[]= _("Required field 'Description' is not set.");
                        $message[]= msgPool::required(_("Description"));
                }
 

diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index e587e20064b08357c927b01993544e0bfcc35e77..deb6fd1ccea2f30968cff9a95b20bb45c7f9bfbc 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -198,7 +198,7 @@ class departmentManagement extends plugin
           $this->deptabs->delete ();
           $this->deptabs = NULL;
         } else {
-          msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
+          msg_dialog::display(_("Permission error"), msgPool::permDelete(), WARNING_DIALOG);
         }
         /* Remove lock file after successfull deletion */
         del_lock ($dn);
@@ -246,7 +246,7 @@ class departmentManagement extends plugin
           return ($display);
         }
       }else{
-        msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
+        msg_dialog::display(_("Permission error"), msgPool::permDelete(), WARNING_DIALOG);
       }
     }
 
@@ -265,7 +265,7 @@ class departmentManagement extends plugin
       if(preg_match("/d/",$acl)){
         $this->remove_from_parent();
       } else {
-        msg_dialog::display(_("Permission error"), _("You have no permission to delete this entry!"), WARNING_DIALOG);
+        msg_dialog::display(_("Permission error"), msgPool::permDelete(), WARNING_DIALOG);
       }
     }