From b24cd46647b16e1ade6d97359a6b30b8071e26f6 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 14 Mar 2008 08:40:40 +0000 Subject: [PATCH] Updated messages git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9801 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/utils/class_msgPool.inc | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gosa-core/include/utils/class_msgPool.inc b/gosa-core/include/utils/class_msgPool.inc index 6e0cb35c9..f46c3aeeb 100644 --- a/gosa-core/include/utils/class_msgPool.inc +++ b/gosa-core/include/utils/class_msgPool.inc @@ -194,31 +194,35 @@ class msgPool return (sprintf(_("Command specified as %s hook for plugin '%s' does not exist!"), $type, $plugin)); } + public static function cmdinvalid($type, $command = "",$plugin="") { if(empty($command)){ - return (sprintf(_("The configured '%s' command is not a valid command."), $type)); + return (sprintf(_("'%s' command is invalid!"), $type)); }elseif($command != "" && $plugin != ""){ - return (sprintf(_("The configured '%s' command (%s) in plugin %s is not a valid command."), $type,$command,$plugin)); + return (sprintf(_("'%s' command (%s) for plugin %s is invalid!"), $type,$command,$plugin)); }elseif($plugin != "" && $command =""){ - return (sprintf(_("The configured '%s' command in plugin %s is not a valid command."), $type,$plugin)); + return (sprintf(_("'%s' command for plugin %s is invalid!"), $type,$plugin)); }else{ - return (sprintf(_("The configured '%s' command (%s) is not a valid command."), $type,$command)); + return (sprintf(_("'%s' command (%s) is invalid!"), $type,$command)); } } + public static function cmdexecfailed($type, $command = "",$plugin="") { if(empty($command)){ - return (sprintf(_("The configured '%s' command wasn't successfully executed."), $type)); + return (sprintf(_("Cannot execute '%s' command!"), $type)); }elseif($command != "" && $plugin != ""){ - return (sprintf(_("The configured '%s' command (%s) in plugin %s wasn't successfully executed."), $type,$command,$plugin)); + return (sprintf(_("Cannot execute '%s' command (%s) for plugin %s!"), $type,$command,$plugin)); }elseif($plugin != "" && $command =""){ - return (sprintf(_("The configured '%s' command in plugin %s wasn't successfully executed."), $type,$plugin)); + return (sprintf(_("Cannot execute '%s' command for plugin %s!"), $type,$plugin)); }else{ - return (sprintf(_("The configured '%s' command (%s) wasn't successfully executed."), $type,$command)); + return (sprintf(_("Cannot execute '%s' command (%s)!"), $type,$command)); } } + + public static function toobig($name, $min= "") { if ($min == ""){ @@ -279,10 +283,10 @@ class msgPool } return sprintf(_("The Field '%s' contains invalid characters"), $name).". ". - (strlen($mismatch)==1?sprintf(_("'%s' is not allowed:"), htmlentities($mismatch)):sprintf(_("'%s' are not allowed."), htmlentities($mismatch))). + (strlen($mismatch)==1?sprintf(_("'%s' is not allowed:"), htmlentities($mismatch)):sprintf(_("'%s' are not allowed!"), htmlentities($mismatch))). "

\"$result\"$example"; } else { - return sprintf(_("The Field '%s' contains invalid characters"), $name)."!$example"; + return sprintf(_("The Field '%s' contains invalid characters"!), $name)."!$example"; } } -- 2.30.2