Commit 590a6e85 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3502 Argonaut is sometimes called «infastructure service» and sometimes...

Fixes #3502 Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»
parent 7bd4b7f0
......@@ -131,7 +131,7 @@ class argonautImportFile extends plugin
$this->parent->o_queue->append($object);
if ($this->parent->o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($this->parent->o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($this->parent->o_queue->get_error()), ERROR_DIALOG);
$fail ++;
} else {
unset($this->events[$key]);
......
......@@ -347,7 +347,7 @@ class argonautQueue extends management
$this->dialogObject->save_object();
$this->o_queue->append($this->dialogObject);
if ($this->o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($this->o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($this->o_queue->get_error()), ERROR_DIALOG);
} else {
$this->current = -1;
}
......
......@@ -567,7 +567,7 @@ class faiPackage extends faiPluginClass
}
$ret = $q->FAI_get_packages($release,$attrs,array_keys($packages),-1,-1,true);
if ($q->is_error()) {
msg_dialog::display(_("Service infrastructure"),msgPool::siError($q->get_error()),ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"),msgPool::siError($q->get_error()),ERROR_DIALOG);
return $this->buffer;
} else {
foreach ($ret as $attr) {
......
......@@ -52,7 +52,7 @@ class faiPackageConfiguration extends plugin
$q = new supportDaemon();
$ret = $q->FAI_get_packages($this->release,array("package","template"),array($this->obj),0,1,true);
if($q->is_error()){
msg_dialog::display(_("Service infrastructure"),msgPool::siError($q->get_error()),ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"),msgPool::siError($q->get_error()),ERROR_DIALOG);
}
/* If we do not get a useable answer, use an empty template
......
......@@ -38,12 +38,12 @@ class filterFAIPackages {
$release = session::get('packageSelect_Release');
$ret = $q->FAI_get_packages($release,$attrs,$filter,0,200);
if ($q->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($q->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($q->get_error()), ERROR_DIALOG);
} else {
for ($i = 0;(count($ret)<200) && ($i<count($customs));$i++) {
$ret2 = $q->FAI_get_packages($customs[$i],$attrs,$filter,0,200-count($ret));
if ($q->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($q->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($q->get_error()), ERROR_DIALOG);
return array();
}
$ret = array_merge($ret,$ret2);
......
......@@ -130,7 +130,7 @@ class faiStartup extends simplePlugin
$o_queue = new supportDaemon();
$tmp = $o_queue->FAI_get_server();
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
$this->cache = array();
return;
} else {
......@@ -157,7 +157,7 @@ class faiStartup extends simplePlugin
$tmp = $o_queue->FAI_get_profiles($release);
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
$this->cache = array();
return;
} else {
......
......@@ -217,7 +217,7 @@ class termgroup extends plugin
$o_queue = new gosaSupportDaemon();
$o_queue->append($tmp);
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}
}
} else {
......
......@@ -292,7 +292,7 @@ class systemManagement extends management
$this->dialogObject->set_type(TRIGGERED_EVENT);
$o_queue->append($this->dialogObject);
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
$this->closeDialogs();
} else {
$this->closeDialogs();
......@@ -322,7 +322,7 @@ class systemManagement extends management
$o_queue = new supportDaemon();
$o_queue->append($this->dialogObject);
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
} else {
$this->closeDialogs();
}
......
......@@ -69,7 +69,7 @@ class ActionAttribute extends SelectAttribute
$tmp->set_type(TRIGGERED_EVENT);
$o_queue = new supportDaemon();
if (!$o_queue->append($tmp)) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
}
} else {
msg_dialog::display(_("Event error"), sprintf(_("Event %s is not available!"), $action), ERROR_DIALOG);
......@@ -440,7 +440,7 @@ class workstationGeneric extends simplePlugin
$tmp->add_targets(array($this->netConfigDNS->macAddress));
$o_queue->append($tmp);
if ($o_queue->is_error()) {
msg_dialog::display(_("Service infrastructure"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment