From 0674fac8fe941e1fe535191f258f53fff2a3eceb Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 13 Mar 2008 11:06:19 +0000 Subject: [PATCH] msgPool git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9734 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/mimetypes/class_mimetypeGeneric.inc | 8 ++++---- .../goto/admin/mimetypes/class_mimetypeManagement.inc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc index 456cf30ba..f5462a3e4 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc @@ -530,10 +530,10 @@ class mimetype extends plugin { $message = plugin::check(); if(empty($this->cn)){ - $message[] = _("Please specify a valid name for this mime type."); + $message[] = msgPool::required(_("Name")); } if(!count($this->use_gotoMimeFilePattern)){ - $message[] = _("Please specify at least one file pattern.") ; + $message[] = msgPool::required(_("File pattern")); } /* Check if there is already a mime type with this cn */ @@ -549,7 +549,7 @@ class mimetype extends plugin if($ldap->count()){ $attrs = $ldap->fetch(); if($this->dn != $attrs['dn']) { - $message[]= _("There's already a mime type with this 'Name'."); + $message[]= msgPool::duplicated(_("Name")); } } }else{ @@ -557,7 +557,7 @@ class mimetype extends plugin if ($ldap->count()){ $attrs = $ldap->fetch(); if($this->dn != $attrs['dn']) { - $message[]= _("There's already an mime with this 'Name'."); + $message[]= msgPool::duplicated(_("Name")); } } } diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc index 89bc5745e..72ef0a03e 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc @@ -300,7 +300,7 @@ class mimetypeManagement extends plugin } /* Lock the current entry, so nobody will edit it during deletion */ - $smarty->assign("info", msgPool::deleteInfo($dns_names,_("mimetype"))); + $smarty->assign("info", msgPool::deleteInfo($dns_names,_("Mime type"))); $smarty->assign("multiple", true); return($smarty->fetch(get_template_path('remove.tpl', TRUE))); } @@ -334,7 +334,7 @@ class mimetypeManagement extends plugin } else { /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ - print_red (_("You are not allowed to delete this mime type!")); + print_red (msgPool::deleteInfo()); new log("security","mimetypes/".get_class($this),$dn,array(),"Tried to trick deletion."); } /* Remove lock file after successfull deletion */ @@ -382,14 +382,14 @@ class mimetypeManagement extends plugin /* Lock the current entry, so nobody will edit it during deletion */ add_lock ($this->dn, $this->ui->dn); $smarty= get_smarty(); - $smarty->assign("info", msgPool::deleteInfo(@LDAP::fix($this->dn),_("mimetype"))); + $smarty->assign("info", msgPool::deleteInfo(@LDAP::fix($this->dn),_("Mime type"))); $smarty->assign("multiple", false); return($smarty->fetch (get_template_path('remove.tpl', TRUE))); } else { /* Obviously the user isn't allowed to delete. Show message and clean session. */ - print_red (_("You are not allowed to delete this mime type!")); + print_red (msgPool::permDelete()); } } @@ -418,7 +418,7 @@ class mimetypeManagement extends plugin /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ - print_red (_("You are not allowed to delete this mime type!")); + print_red (msgPool::permDelete()); new log("security","mimetypes/".get_class($this),$dn,array(),"Tried to trick deletion."); } -- 2.30.2