Fixed messages

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

diff --git a/gosa-core/include/utils/class_msgPool.inc b/gosa-core/include/utils/class_msgPool.inc
index 464bca9b20d54d8a215c1f8481289dee17418817..c8831f325e1dcfe3c343b852c70d66adbff12a36 100644 (file)
--- a/gosa-core/include/utils/class_msgPool.inc
+++ b/gosa-core/include/utils/class_msgPool.inc
@@ -303,15 +303,15 @@ class msgPool
        if ($depends == ""){
                return sprintf(_("This account has %s settings enabled. You can disable them by clicking below."), $name);
        } else {
-               if (is_array($depends)){
-                       return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $depends);
+               if (count($depends) == 1){
+                       return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $name, $depends);
                } else {
                        $deps= "";
                        foreach ($depends as $dep){
                                $deps.= "$dep / ";
                        }
                        $deps= preg_replace("/ \/ $/", "", $deps);
-                       return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $deps);
+                       return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $name, $deps);
                }
        }
   }
@@ -322,15 +322,15 @@ class msgPool
        if ($depends == ""){
                return sprintf(_("This account has %s settings disabled. You can enable them by clicking below."), $name);
        } else {
-               if (is_array($depends)){
-                       return sprintf(_("This account has %s settings disabled. To enable them, you'll need to add the %s settings first!"), $depends);
+               if (count($depends) == 1){
+                       return sprintf(_("This account has %s settings disabled. To enable them, you'll need to add the %s settings first!"), $name, $depends);
                } else {
                        $deps= "";
                        foreach ($depends as $dep){
                                $deps.= "$dep / ";
                        }
                        $deps= preg_replace("/ \/ $/", "", $deps);
-                       return sprintf(_("This account has %s features settings. To disable them, you'll need to add the %s settings first!"), $deps);
+                       return sprintf(_("This account has %s features settings. To disable them, you'll need to add the %s settings first!"), $name, $deps);
                }
        }
   }