msgPool

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

diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index ab4b1ccf79f2d7894ec57059f8313c52b3664ccf..f40791a4dcbe38b86f7647236807391fd39e6933 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -465,15 +465,15 @@ class divListSystem extends MultiSelectWindow
       $num_deps = count($this->Added_Departments);
     }
 
-    $num_ser_str = sprintf(_("Number of listed %s"),_("servers"));
-    $num_ws_str  = sprintf(_("Number of listed %s"),_("workstations"));
-    $num_ter_str = sprintf(_("Number of listed %s"),_("terminals"));
-    $num_pho_str = sprintf(_("Number of listed %s"),_("phones"));
-    $num_prt_str = sprintf(_("Number of listed %s"),_("printers"));
-    $num_com_str = sprintf(_("Number of listed %s"),_("network components"));
-    $num_new_str = sprintf(_("Number of listed %s"),_("new devices"));
-    $num_wws_str = sprintf(_("Number of listed %s"),_("windows workstations"));
-    $num_dep_str = sprintf(_("Number of listed %s"),_("departments"));
+    $num_ser_str = sprintf(_("Number of listed '%s'"),_("servers"));
+    $num_ws_str  = sprintf(_("Number of listed '%s'"),_("workstations"));
+    $num_ter_str = sprintf(_("Number of listed '%s'"),_("terminals"));
+    $num_pho_str = sprintf(_("Number of listed '%s'"),_("phones"));
+    $num_prt_str = sprintf(_("Number of listed '%s'"),_("printers"));
+    $num_com_str = sprintf(_("Number of listed '%s'"),_("network components"));
+    $num_new_str = sprintf(_("Number of listed '%s'"),_("new devices"));
+    $num_wws_str = sprintf(_("Number of listed '%s'"),_("windows workstations"));
+    $num_dep_str = sprintf(_("Number of listed '%s'"),_("departments"));
 
     $str = "<img class='center' src='images/select_server.png'
       title='".$num_ser_str."' alt='".$num_ser_str."'>&nbsp;".$cnts['server']."&nbsp;&nbsp;&nbsp;&nbsp;";

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index b2295c8ab0ddcf5e55ddfc52ab9af19b70db647a..f791615f68fd2936ced971b8bcea92cd63af0f8a 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -140,8 +140,7 @@ class servgeneric extends plugin
           $tmp->set_type(TRIGGERED_EVENT);
           $o_queue = new gosaSupportDaemon();
           if(!$o_queue->append($tmp)){
-            msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                  $o_queue->get_error()),ERROR_DIALOG);
+            msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
           }
         }
       }else{
@@ -407,8 +406,7 @@ class servgeneric extends plugin
         $tmp->set_type(TRIGGERED_EVENT);
         $tmp->add_targets(array($this->netConfigDNS->macAddress));
         if(!$o_queue->append($tmp)){
-          msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                $o_queue->get_error()),ERROR_DIALOG);
+          msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
         }
       }
     }

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 3fd3171adce64f6ef7f9475b4975906d738e2a7f..6adc26b4041b07a469d7e61e6f9ee538a3eae15b 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -545,8 +545,7 @@ class systems extends plugin
         $o_queue = new gosaSupportDaemon();
         $o_queue->append($this->systab);
         if($o_queue->is_error()){
-          msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                $o_queue->get_error()),ERROR_DIALOG);
+          msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
         }else{
           $this->systab = FALSE;
         }
@@ -894,8 +893,7 @@ class systems extends plugin
             $o_queue = new gosaSupportDaemon();
             $o_queue->append($tmp);
             if($o_queue->is_error()){
-              msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                    $o_queue->get_error()),ERROR_DIALOG);
+              msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
             }
           }
         }