Use mt() in the monitoring module instead of just t()

fixes #7330

modules/monitoring/application/controllers/AlertsummaryController.php

@@ -342,7 +342,7 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart = new GridChart();
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel('', t('Notifications'))
+        $gridChart->setAxisLabel('', mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0)
             ->setYAxis(new LinearUnit(10));
@@ -470,7 +470,7 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart = new GridChart();
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel('', t('Notifications'))
+        $gridChart->setAxisLabel('', mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0)
             ->setYAxis(new LinearUnit(10));
@@ -530,12 +530,12 @@ class Monitoring_AlertsummaryController extends Controller
         $box = new SelectBox(
             'intervalBox',
             array(
-                '1d' => t('One day'),
+                '1d' => mt('monitoring', 'One day'),
-                '1w' => t('One week'),
+                '1w' => mt('monitoring', 'One week'),
-                '1m' => t('One month'),
+                '1m' => mt('monitoring', 'One month'),
-                '1y' => t('One year')
+                '1y' => mt('monitoring', 'One year')
             ),
-            t('Report interval'),
+            mt('monitoring', 'Report interval'),
             'interval'
         );
         $box->applyRequest($this->getRequest());

modules/monitoring/application/controllers/ChartController.php

@@ -143,35 +143,35 @@ class Monitoring_ChartController extends Controller
         }
         $this->view->chart = new GridChart();
         $this->view->chart->alignTopLeft();
-        $this->view->chart->setAxisLabel('', t('Services'))
+        $this->view->chart->setAxisLabel('', mt('monitoring', 'Services'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0);
 
-        $tooltip = t('<b>{title}:</b><br>{value} of {sum} services are {label}');
+        $tooltip = mt('monitoring', '<b>{title}:</b><br>{value} of {sum} services are {label}');
         $this->view->chart->drawBars(
             array(
-                'label' => t('Ok'),
+                'label' => mt('monitoring', 'Ok'),
                 'color' => '#44bb77',
                 'stack' => 'stack1',
                 'data'  => $okBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => t('Warning'),
+                'label' => mt('monitoring', 'Warning'),
                 'color' => '#ffaa44',
                 'stack' => 'stack1',
                 'data'  => $warningBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => t('Critical'),
+                'label' => mt('monitoring', 'Critical'),
                 'color' => '#ff5566',
                 'stack' => 'stack1',
                 'data'  => $critBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => t('Unknown'),
+                'label' => mt('monitoring', 'Unknown'),
                 'color' => '#dd66ff',
                 'stack' => 'stack1',
                 'data'  => $unknownBars,
@@ -199,29 +199,29 @@ class Monitoring_ChartController extends Controller
                 $hostgroup->hosts_unreachable_unhandled
             );
         }
-        $tooltip = t('<b>{title}:</b><br> {value} of {sum} hosts are {label}');
+        $tooltip = mt('monitoring', '<b>{title}:</b><br> {value} of {sum} hosts are {label}');
         $this->view->chart = new GridChart();
         $this->view->chart->alignTopLeft();
-        $this->view->chart->setAxisLabel('', t('Hosts'))
+        $this->view->chart->setAxisLabel('', mt('monitoring', 'Hosts'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0);
         $this->view->chart->drawBars(
             array(
-                'label' => t('Up'),
+                'label' => mt('monitoring', 'Up'),
                 'color' => '#44bb77',
                 'stack' => 'stack1',
                 'data'  => $upBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => t('Down'),
+                'label' => mt('monitoring', 'Down'),
                 'color' => '#ff5566',
                 'stack' => 'stack1',
                 'data'  => $downBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => t('Unreachable'),
+                'label' => mt('monitoring', 'Unreachable'),
                 'color' => '#dd66ff',
                 'stack' => 'stack1',
                 'data'  => $unreachableBars,
@@ -248,13 +248,13 @@ class Monitoring_ChartController extends Controller
             'colors' => array('#44bb77', '#ff4444', '#ff0000', '#ffff00', '#ffff33', '#E066FF', '#f099FF', '#fefefe'),
             'labels'=> array(
                 $query->services_ok . ' Up Services',
-                $query->services_warning_handled . t(' Warning Services (Handled)'),
+                $query->services_warning_handled . mt('monitoring', ' Warning Services (Handled)'),
-                $query->services_warning_unhandled . t(' Warning Services (Unhandled)'),
+                $query->services_warning_unhandled . mt('monitoring', ' Warning Services (Unhandled)'),
-                $query->services_critical_handled . t(' Down Services (Handled)'),
+                $query->services_critical_handled . mt('monitoring', ' Down Services (Handled)'),
-                $query->services_critical_unhandled . t(' Down Services (Unhandled)'),
+                $query->services_critical_unhandled . mt('monitoring', ' Down Services (Unhandled)'),
-                $query->services_unknown_handled . t(' Unreachable Services (Handled)'),
+                $query->services_unknown_handled . mt('monitoring', ' Unreachable Services (Handled)'),
-                $query->services_unknown_unhandled . t(' Unreachable Services (Unhandled)'),
+                $query->services_unknown_unhandled . mt('monitoring', ' Unreachable Services (Unhandled)'),
-                $query->services_pending . t(' Pending Services')
+                $query->services_pending . mt('monitoring', ' Pending Services')
             )
         ));
     }
@@ -274,12 +274,12 @@ class Monitoring_ChartController extends Controller
             ),
             'colors' => array('#44bb77', '#ff4444', '#ff0000', '#E066FF', '#f099FF', '#fefefe'),
             'labels'=> array(
-                (int) $query->hosts_up . t(' Up Hosts'),
+                (int) $query->hosts_up . mt('monitoring', ' Up Hosts'),
-                (int) $query->hosts_down_handled . t(' Down Hosts (Handled)'),
+                (int) $query->hosts_down_handled . mt('monitoring', ' Down Hosts (Handled)'),
-                (int) $query->hosts_down_unhandled . t(' Down Hosts (Unhandled)'),
+                (int) $query->hosts_down_unhandled . mt('monitoring', ' Down Hosts (Unhandled)'),
-                (int) $query->hosts_unreachable_handled . t(' Unreachable Hosts (Handled)'),
+                (int) $query->hosts_unreachable_handled . mt('monitoring', ' Unreachable Hosts (Handled)'),
-                (int) $query->hosts_unreachable_unhandled . t(' Unreachable Hosts (Unhandled)'),
+                (int) $query->hosts_unreachable_unhandled . mt('monitoring', ' Unreachable Hosts (Unhandled)'),
-                (int) $query->hosts_pending . t(' Pending Hosts')
+                (int) $query->hosts_pending . mt('monitoring', ' Pending Hosts')
             )
         ), array(
             'data' => array(
@@ -294,14 +294,14 @@ class Monitoring_ChartController extends Controller
             ),
             'colors' => array('#44bb77', '#ff4444', '#ff0000', '#ffff00', '#ffff33', '#E066FF', '#f099FF', '#fefefe'),
             'labels'=> array(
-                $query->services_ok . t(' Up Services'),
+                $query->services_ok . mt('monitoring', ' Up Services'),
-                $query->services_warning_handled . t(' Warning Services (Handled)'),
+                $query->services_warning_handled . mt('monitoring', ' Warning Services (Handled)'),
-                $query->services_warning_unhandled . t(' Warning Services (Unhandled)'),
+                $query->services_warning_unhandled . mt('monitoring', ' Warning Services (Unhandled)'),
-                $query->services_critical_handled . t(' Down Services (Handled)'),
+                $query->services_critical_handled . mt('monitoring', ' Down Services (Handled)'),
-                $query->services_critical_unhandled . t(' Down Services (Unhandled)'),
+                $query->services_critical_unhandled . mt('monitoring', ' Down Services (Unhandled)'),
-                $query->services_unknown_handled . t(' Unreachable Services (Handled)'),
+                $query->services_unknown_handled . mt('monitoring', ' Unreachable Services (Handled)'),
-                $query->services_unknown_unhandled . t(' Unreachable Services (Unhandled)'),
+                $query->services_unknown_unhandled . mt('monitoring', ' Unreachable Services (Unhandled)'),
-                $query->services_pending . t(' Pending Services')
+                $query->services_pending . mt('monitoring', ' Pending Services')
             )
         ));
     }

modules/monitoring/application/controllers/ConfigController.php

@@ -73,7 +73,7 @@ class Monitoring_ConfigController extends ModuleActionController
                 }
 
                 if ($configForm->save()) {
-                    Notification::success(sprintf(t('Backend "%s" successfully removed.'), $backendName));
+                    Notification::success(sprintf(mt('monitoring', 'Backend "%s" successfully removed.'), $backendName));
                 } else {
                     return false;
                 }
@@ -105,7 +105,7 @@ class Monitoring_ConfigController extends ModuleActionController
                 }
 
                 if ($configForm->save()) {
-                    Notification::success(sprintf(t('Instance "%s" successfully removed.'), $instanceName));
+                    Notification::success(sprintf(mt('monitoring', 'Instance "%s" successfully removed.'), $instanceName));
                 } else {
                     return false;
                 }

modules/monitoring/application/controllers/HostsController.php

@@ -46,7 +46,7 @@ class Monitoring_HostsController extends Controller
         $this->getTabs()->add(
             'show',
             array(
-                'title' => t('Hosts'),
+                'title' => mt('monitoring', 'Hosts'),
                 'url' => Url::fromRequest()
             )
         )->activate('show');

modules/monitoring/application/controllers/ListController.php

@@ -395,10 +395,10 @@ class Monitoring_ListController extends Controller
         $orientationBox = new SelectBox(
             'orientation',
             array(
-                '0' => t('Vertical'),
+                '0' => mt('monitoring', 'Vertical'),
-                '1' => t('Horizontal')
+                '1' => mt('monitoring', 'Horizontal')
             ),
-            t('Orientation'),
+            mt('monitoring', 'Orientation'),
             'horizontal'
         );
         $orientationBox->applyRequest($this->getRequest());

modules/monitoring/application/controllers/MultiController.php

@@ -54,7 +54,7 @@ class Monitoring_MultiController extends Controller
         $this->view->pie = $this->createPie(
             $this->view->states,
             $this->view->getHelper('MonitoringState')->getHostStateColors(),
-            t('Host State')
+            mt('monitoring', 'Host State')
         );
 
         // Handle configuration changes
@@ -117,12 +117,12 @@ class Monitoring_MultiController extends Controller
         $this->view->service_pie    = $this->createPie(
             $this->view->service_states,
             $this->view->getHelper('MonitoringState')->getServiceStateColors(),
-            t('Service State')
+            mt('monitoring', 'Service State')
         );
         $this->view->host_pie       = $this->createPie(
             $this->view->host_states,
             $this->view->getHelper('MonitoringState')->getHostStateColors(),
-            t('Host State')
+            mt('monitoring', 'Host State')
         );
         $this->view->errors         = $errors;
 

modules/monitoring/application/controllers/ServicesController.php

@@ -46,7 +46,7 @@ class Monitoring_ServicesController extends Controller
         $this->getTabs()->add(
             'show',
             array(
-                'title' => t('Services'),
+                'title' => mt('monitoring', 'Services'),
                 'url' => Url::fromRequest()
             )
         )->activate('show');

modules/monitoring/application/controllers/TimelineController.php

@@ -35,32 +35,32 @@ class Monitoring_TimelineController extends Controller
             array(
                 'notify'        => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Notifications'),
+                    'label'     => mt('monitoring', 'Notifications'),
                     'color'     => '#3a71ea'
                 ),
                 'hard_state'    => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Hard state changes'),
+                    'label'     => mt('monitoring', 'Hard state changes'),
                     'color'     => '#ff7000'
                 ),
                 'comment'       => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Comments'),
+                    'label'     => mt('monitoring', 'Comments'),
                     'color'     => '#79bdba'
                 ),
                 'ack'           => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Acknowledgements'),
+                    'label'     => mt('monitoring', 'Acknowledgements'),
                     'color'     => '#a2721d'
                 ),
                 'dt_start'      => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Started downtimes'),
+                    'label'     => mt('monitoring', 'Started downtimes'),
                     'color'     => '#8e8e8e'
                 ),
                 'dt_end'        => array(
                     'detailUrl' => $detailUrl,
-                    'label'     => t('Ended downtimes'),
+                    'label'     => mt('monitoring', 'Ended downtimes'),
                     'color'     => '#d5d6ad'
                 )
             )
@@ -88,13 +88,13 @@ class Monitoring_TimelineController extends Controller
         $box = new SelectBox(
             'intervalBox',
             array(
-                '4h' => t('4 Hours'),
+                '4h' => mt('monitoring', '4 Hours'),
-                '1d' => t('One day'),
+                '1d' => mt('monitoring', 'One day'),
-                '1w' => t('One week'),
+                '1w' => mt('monitoring', 'One week'),
-                '1m' => t('One month'),
+                '1m' => mt('monitoring', 'One month'),
-                '1y' => t('One year')
+                '1y' => mt('monitoring', 'One year')
             ),
-            t('TimeLine interval'),
+            mt('monitoring', 'TimeLine interval'),
             'interval'
         );
         $box->applyRequest($this->getRequest());

modules/monitoring/application/forms/Config/BackendConfigForm.php

@@ -29,7 +29,7 @@ class BackendConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_backends');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
     }
 
     /**
@@ -51,7 +51,7 @@ class BackendConfigForm extends ConfigForm
         }
 
         if (empty($resources)) {
-            throw new ConfigurationError(t('Could not find any valid monitoring backend resources'));
+            throw new ConfigurationError(mt('monitoring', 'Could not find any valid monitoring backend resources'));
         }
 
         $this->resources = $resources;
@@ -73,9 +73,9 @@ class BackendConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(t('Monitoring backend name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend name missing'));
         } elseif ($this->config->get($name) !== null) {
-            throw new InvalidArgumentException(t('Monitoring backend already exists'));
+            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend already exists'));
         }
 
         unset($values['name']);
@@ -96,11 +96,11 @@ class BackendConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Old monitoring backend name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Old monitoring backend name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(t('New monitoring backend name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'New monitoring backend name missing'));
         } elseif (($backendConfig = $this->config->get($name)) === null) {
-            throw new InvalidArgumentException(t('Unknown monitoring backend provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown monitoring backend provided'));
         }
 
         unset($values['name']);
@@ -121,9 +121,9 @@ class BackendConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Monitoring backend name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend name missing'));
         } elseif (($backendConfig = $this->config->get($name)) === null) {
-            throw new InvalidArgumentException(t('Unknown monitoring backend provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown monitoring backend provided'));
         }
 
         unset($this->config->{$name});
@@ -141,10 +141,10 @@ class BackendConfigForm extends ConfigForm
         try {
             if ($monitoringBackend === null) { // create new backend
                 $this->add($this->getValues());
-                $message = t('Monitoring backend "%s" has been successfully created');
+                $message = mt('monitoring', 'Monitoring backend "%s" has been successfully created');
             } else { // edit existing backend
                 $this->edit($monitoringBackend, $this->getValues());
-                $message = t('Monitoring backend "%s" has been successfully changed');
+                $message = mt('monitoring', 'Monitoring backend "%s" has been successfully changed');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -170,9 +170,9 @@ class BackendConfigForm extends ConfigForm
         $monitoringBackend = $request->getQuery('backend');
         if ($monitoringBackend !== null) {
             if ($monitoringBackend === '') {
-                throw new ConfigurationError(t('Monitoring backend name missing'));
+                throw new ConfigurationError(mt('monitoring', 'Monitoring backend name missing'));
             } elseif (false === isset($this->config->{$monitoringBackend})) {
-                throw new ConfigurationError(t('Unknown monitoring backend provided'));
+                throw new ConfigurationError(mt('monitoring', 'Unknown monitoring backend provided'));
             }
 
             $backendConfig = $this->config->{$monitoringBackend}->toArray();
@@ -201,7 +201,7 @@ class BackendConfigForm extends ConfigForm
             'disabled',
             array(
                 'required'  => true,
-                'label'     => t('Disable This Backend')
+                'label'     => mt('monitoring', 'Disable This Backend')
             )
         );
         $this->addElement(
@@ -209,8 +209,8 @@ class BackendConfigForm extends ConfigForm
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Backend Name'),
+                'label'         => mt('monitoring', 'Backend Name'),
-                'description'   => t('The identifier of this backend')
+                'description'   => mt('monitoring', 'The identifier of this backend')
             )
         );
         $this->addElement(
@@ -219,8 +219,8 @@ class BackendConfigForm extends ConfigForm
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => t('Backend Type'),
+                'label'         => mt('monitoring', 'Backend Type'),
-                'description'   => t('The data source used for retrieving monitoring information'),
+                'description'   => mt('monitoring', 'The data source used for retrieving monitoring information'),
                 'multiOptions'  => $resourceTypes,
                 'value'         => $resourceType
             )
@@ -230,8 +230,8 @@ class BackendConfigForm extends ConfigForm
             'resource',
             array(
                 'required'      => true,
-                'label'         => t('Resource'),
+                'label'         => mt('monitoring', 'Resource'),
-                'description'   => t('The resource to use'),
+                'description'   => mt('monitoring', 'The resource to use'),
                 'multiOptions'  => $this->resources[$resourceType]
             )
         );

modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php

@@ -26,9 +26,9 @@ class LocalInstanceForm extends Form
             'path',
             array(
                 'required'      => true,
-                'label'         => t('Local Filepath'),
+                'label'         => mt('monitoring', 'Local Filepath'),
                 'value'         => '/usr/local/icinga/var/rw/icinga.cmd',
-                'description'   => t('The file path where the icinga commandpipe can be found')
+                'description'   => mt('monitoring', 'The file path where the icinga commandpipe can be found')
             )
         );
 

modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php

@@ -24,8 +24,8 @@ class RemoteInstanceForm extends Form
             'host',
             array(
                 'required'      => true,
-                'label'         => t('Remote Host'),
+                'label'         => mt('monitoring', 'Remote Host'),
-                'description'   => t(
+                'description'   => mt('monitoring',
                     'Enter the hostname or address of the machine on which the icinga instance is running'
                 )
             )
@@ -35,8 +35,8 @@ class RemoteInstanceForm extends Form
                 array(
                     'required'      => true,
                     'name'          => 'port',
-                    'label'         => t('Remote SSH Port'),
+                    'label'         => mt('monitoring', 'Remote SSH Port'),
-                    'description'   => t('Enter the ssh port to use for connecting to the remote icinga instance'),
+                    'description'   => mt('monitoring', 'Enter the ssh port to use for connecting to the remote icinga instance'),
                     'value'         => 22
                 )
             )
@@ -46,8 +46,8 @@ class RemoteInstanceForm extends Form
             'user',
             array(
                 'required'      => true,
-                'label'         => t('Remote SSH User'),
+                'label'         => mt('monitoring', 'Remote SSH User'),
-                'description'   => t(
+                'description'   => mt('monitoring',
                     'Enter the username to use for connecting to the remote machine or leave blank for default'
                 )
             )
@@ -57,9 +57,9 @@ class RemoteInstanceForm extends Form
             'path',
             array(
                 'required'      => true,
-                'label'         => t('Remote Filepath'),
+                'label'         => mt('monitoring', 'Remote Filepath'),
                 'value'         => '/usr/local/icinga/var/rw/icinga.cmd',
-                'description'   => t('The file path where the icinga commandpipe can be found')
+                'description'   => mt('monitoring', 'The file path where the icinga commandpipe can be found')
             )
         );
 

modules/monitoring/application/forms/Config/InstanceConfigForm.php

@@ -23,7 +23,7 @@ class InstanceConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_instance');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
     }
 
     /**
@@ -42,7 +42,7 @@ class InstanceConfigForm extends ConfigForm
         } elseif ($type === 'remote') {
             return new RemoteInstanceForm();
         } else {
-            throw new InvalidArgumentException(sprintf(t('Invalid instance type "%s" provided'), $type));
+            throw new InvalidArgumentException(sprintf(mt('monitoring', 'Invalid instance type "%s" provided'), $type));
         }
     }
 
@@ -61,9 +61,9 @@ class InstanceConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(t('Instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
         } elseif ($this->config->get($name) !== null) {
-            throw new InvalidArgumentException(t('Instance already exists'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance already exists'));
         }
 
         unset($values['name']);
@@ -84,11 +84,11 @@ class InstanceConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Old instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Old instance name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(t('New instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'New instance name missing'));
         } elseif (! ($instanceConfig = $this->config->get($name))) {
-            throw new InvalidArgumentException(t('Unknown instance name provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
         }
 
         unset($values['name']);
@@ -109,9 +109,9 @@ class InstanceConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
         } elseif (! ($instanceConfig = $this->config->get($name))) {
-            throw new InvalidArgumentException(t('Unknown instance name provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
         }
 
         unset($this->config->{$name});
@@ -128,10 +128,10 @@ class InstanceConfigForm extends ConfigForm
         try {
             if ($instanceName === null) { // create new instance
                 $this->add($this->getValues());
-                $message = t('Instance "%s" created successfully.');
+                $message = mt('monitoring', 'Instance "%s" created successfully.');
             } else { // edit existing instance
                 $this->edit($instanceName, $this->getValues());
-                $message = t('Instance "%s" edited successfully.');
+                $message = mt('monitoring', 'Instance "%s" edited successfully.');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -155,9 +155,9 @@ class InstanceConfigForm extends ConfigForm
         $instanceName = $request->getQuery('instance');
         if ($instanceName !== null) {
             if (! $instanceName) {
-                throw new ConfigurationError(t('Instance name missing'));
+                throw new ConfigurationError(mt('monitoring', 'Instance name missing'));
             } elseif (false === isset($this->config->{$instanceName})) {
-                throw new ConfigurationError(t('Unknown instance name provided'));
+                throw new ConfigurationError(mt('monitoring', 'Unknown instance name provided'));
             }
 
             $instanceConfig = $this->config->{$instanceName}->toArray();
@@ -182,7 +182,7 @@ class InstanceConfigForm extends ConfigForm
             'name',
             array(
                 'required'  => true,
-                'label'     => t('Instance Name')
+                'label'     => mt('monitoring', 'Instance Name')
             )
         );
         $this->addElement(
@@ -192,13 +192,13 @@ class InstanceConfigForm extends ConfigForm
                 'required'      => true,
                 'ignore'        => true,
                 'autosubmit'    => true,
-                'label'         => t('Instance Type'),
+                'label'         => mt('monitoring', 'Instance Type'),
-                'description'   => t(
+                'description'   => mt('monitoring',
                     'When configuring a remote host, you need to setup passwordless key authentication'
                 ),
                 'multiOptions'  => array(
-                    'local'     => t('Local Command Pipe'),
+                    'local'     => mt('monitoring', 'Local Command Pipe'),
-                    'remote'    => t('Remote Command Pipe')
+                    'remote'    => mt('monitoring', 'Remote Command Pipe')
                 ),
                 'value'         => $instanceType
             )

modules/monitoring/application/forms/Config/SecurityConfigForm.php

@@ -19,7 +19,7 @@ class SecurityConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_security');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
     }
 
     /**
@@ -30,7 +30,7 @@ class SecurityConfigForm extends ConfigForm
         $this->config->security = $this->getValues();
 
         if ($this->save()) {
-            Notification::success(t('New security configuration has successfully been stored'));
+            Notification::success(mt('monitoring', 'New security configuration has successfully been stored'));
         } else {
             return false;
         }
@@ -56,8 +56,8 @@ class SecurityConfigForm extends ConfigForm
             'protected_customvars',
             array(
                 'required'      => true,
-                'label'         => t('Protected Custom Variables'),
+                'label'         => mt('monitoring', 'Protected Custom Variables'),
-                'description'   => t(
+                'description'   => mt('monitoring',
                     'Comma separated case insensitive list of protected custom variables.'
                     . ' Use * as a placeholder for zero or more wildcard characters.'
                     . ' Existance of those custom variables will be shown, but their values will be masked.'

modules/monitoring/application/forms/StatehistoryForm.php

@@ -56,14 +56,14 @@ class StatehistoryForm extends Form
             'select',
             'from',
             array(
-                'label' => t('From'),
+                'label' => mt('monitoring', 'From'),
                 'value' => $this->getRequest()->getParam('from', strtotime('3 months ago')),
                 'multiOptions' => array(
-                    strtotime('midnight 3 months ago') => t('3 Months'),
+                    strtotime('midnight 3 months ago') => mt('monitoring', '3 Months'),
-                    strtotime('midnight 4 months ago') => t('4 Months'),
+                    strtotime('midnight 4 months ago') => mt('monitoring', '4 Months'),
-                    strtotime('midnight 8 months ago') => t('8 Months'),
+                    strtotime('midnight 8 months ago') => mt('monitoring', '8 Months'),
-                    strtotime('midnight 12 months ago') => t('1 Year'),
+                    strtotime('midnight 12 months ago') => mt('monitoring', '1 Year'),
-                    strtotime('midnight 24 months ago') => t('2 Years')
+                    strtotime('midnight 24 months ago') => mt('monitoring', '2 Years')
                 ),
                 'class' => 'autosubmit'
             )
@@ -72,10 +72,10 @@ class StatehistoryForm extends Form
             'select',
             'to',
             array(
-                'label' => t('To'),
+                'label' => mt('monitoring', 'To'),
                 'value' => $this->getRequest()->getParam('to', time()),
                 'multiOptions' => array(
-                    time() => t('Today')
+                    time() => mt('monitoring', 'Today')
                 ),
                 'class' => 'autosubmit'
             )
@@ -86,11 +86,11 @@ class StatehistoryForm extends Form
             'select',
             'objecttype',
             array(
-                'label' => t('Object type'),
+                'label' => mt('monitoring', 'Object type'),
                 'value' => $objectType,
                 'multiOptions' => array(
-                    'services' => t('Services'),
+                    'services' => mt('monitoring', 'Services'),
-                    'hosts' => t('Hosts')
+                    'hosts' => mt('monitoring', 'Hosts')
                 ),
                 'class' => 'autosubmit'
             )
@@ -104,13 +104,13 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => t('State'),
+                    'label' => mt('monitoring', 'State'),
                     'value' => $serviceState,
                     'multiOptions' => array(
-                        'cnt_critical_hard' => t('Critical'),
+                        'cnt_critical_hard' => mt('monitoring', 'Critical'),
-                        'cnt_warning_hard' => t('Warning'),
+                        'cnt_warning_hard' => mt('monitoring', 'Warning'),
-                        'cnt_unknown_hard' => t('Unknown'),
+                        'cnt_unknown_hard' => mt('monitoring', 'Unknown'),
-                        'cnt_ok' => t('Ok')
+                        'cnt_ok' => mt('monitoring', 'Ok')
                     ),
                     'class' => 'autosubmit'
                 )
@@ -124,12 +124,12 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => t('State'),
+                    'label' => mt('monitoring', 'State'),
                     'value' => $hostState,
                     'multiOptions' =>  array(
-                        'cnt_up' => t('Up'),
+                        'cnt_up' => mt('monitoring', 'Up'),
-                        'cnt_down_hard' => t('Down'),
+                        'cnt_down_hard' => mt('monitoring', 'Down'),
-                        'cnt_unreachable_hard' => t('Unreachable')
+                        'cnt_unreachable_hard' => mt('monitoring', 'Unreachable')
                     ),
                     'class' => 'autosubmit'
                 )
@@ -143,7 +143,7 @@ class StatehistoryForm extends Form
                 'escape'    => false,
                 'value'     => '1',
                 'class'     => 'btn btn-cta btn-common',
-                'label'     => t('Apply')
+                'label'     => mt('monitoring', 'Apply')
             )
         );
     }

modules/monitoring/application/views/scripts/command/list.phtml

@@ -1,4 +1,4 @@
-<h4><?= t('List Of Supported Commands'); ?></h4>
+<h4><?= mt('monitoring', 'List Of Supported Commands'); ?></h4>
 <ul>
   <?php foreach($this->commands as $command): ?>
   <li>

modules/monitoring/application/views/scripts/list/contactgroups.phtml

@@ -8,7 +8,7 @@
 
 <?php
 if (count($groupData) === 0) {
-    echo t('No contacts matching the filter');
+    echo mt('monitoring', 'No contacts matching the filter');
 }
 
 foreach ($groupData as $groupName => $groupInfo): ?>

modules/monitoring/application/views/scripts/list/contacts.phtml

@@ -13,7 +13,7 @@ $contactHelper = $this->getHelper('ContactFlags');
 <div data-base-target="_next" class="content contacts">
     <?php
     if (count($contacts) === 0) {
-        echo t('No contacts matching the filter');
+        echo mt('monitoring', 'No contacts matching the filter');
         return;
     }
     foreach ($contacts as $contact): ?>
@@ -25,12 +25,12 @@ $contactHelper = $this->getHelper('ContactFlags');
             ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
             <div><?= sprintf(
                 '%1$s: <a href="mailto:%2$s">%2$s</a>',
-                t('Email'),
+                mt('monitoring', 'Email'),
                 $this->escape($contact->contact_email)
             ) ?></div>
             <?php if ($contact->contact_pager): ?>
             <div>
-                <?= t('Pager') ?>:
+                <?= mt('monitoring', 'Pager') ?>:
                 <?= $this->escape($contact->contact_pager) ?>
             </div>
             <?php endif; ?>
@@ -38,13 +38,13 @@ $contactHelper = $this->getHelper('ContactFlags');
             <div class="notification-periods">
                 <?php if ($contact->contact_notify_service_timeperiod): ?>
                 <div>
-                    <?= t('Service notification period') ?>:
+                    <?= mt('monitoring', 'Service notification period') ?>:
                     <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
                 </div>
                 <?php endif; ?>
                 <?php if ($contact->contact_notify_host_timeperiod): ?>
                 <div>
-                    <?= t('Host notification period') ?>:
+                    <?= mt('monitoring', 'Host notification period') ?>:
                     <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
                 </div>
                 <?php endif; ?>

modules/monitoring/application/views/scripts/list/hostgroups.phtml

@@ -8,7 +8,7 @@
 
 <?php
 if (count($hostgroups) === 0) {
-    echo t('No host groups matching the filter');
+    echo mt('monitoring', 'No host groups matching the filter');
 }
 ?>
 <?php foreach($hostgroups as $h): ?>

modules/monitoring/application/views/scripts/list/notifications.phtml

@@ -26,7 +26,7 @@ if (empty($this->notifications)) {
 <?php
 
 if (count($notifications) === 0) {
-    echo t('No notifications matching the filter');
+    echo mt('monitoring', 'No notifications matching the filter');
 }
 foreach ($notifications as $notification):
 

modules/monitoring/application/views/scripts/list/servicegroups.phtml

@@ -8,7 +8,7 @@
 
 <?php
 if (count($servicegroups) === 0) {
-    echo t('No service groups matching the filter');
+    echo mt('monitoring', 'No service groups matching the filter');
 }
 ?>
 <?php foreach($servicegroups as $servicegroup): ?>

modules/monitoring/application/views/scripts/list/services.phtml

@@ -36,7 +36,7 @@ if (!$this->compact): ?>
 <?php
 
 if (count($services) === 0) {
-    echo t('No services matching the filter');
+    echo mt('monitoring', 'No services matching the filter');
 }
 foreach ($services as $service):
     $serviceLink = $this->href(

modules/monitoring/application/views/scripts/list/statehistorysummary.phtml

@@ -23,39 +23,39 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
 
 $settings = array(
     'cnt_up' => array(
-        'tooltip' => t('%d ok on %s'),
+        'tooltip' => mt('monitoring', '%d ok on %s'),
         'color' => '#49DF96',
         'opacity' => '0.55'
     ),
     'cnt_unreachable_hard' => array(
-        'tooltip' => t('%d unreachable on %s'),
+        'tooltip' => mt('monitoring', '%d unreachable on %s'),
         'color' => '#77AAFF',
         'opacity' => '0.55'
     ),
     'cnt_critical_hard' => array(
-        'tooltip' => t('%d critical on %s'),
+        'tooltip' => mt('monitoring', '%d critical on %s'),
         'color' => '#ff5566',
         'opacity' => '0.9'
     ),
 
     'cnt_warning_hard' => array(
-        'tooltip' => t('%d warning on %s'),
+        'tooltip' => mt('monitoring', '%d warning on %s'),
         'color' => '#ffaa44',
         'opacity' => '1.0'
     ),
 
     'cnt_down_hard' => array(
-        'tooltip' => t('%d down on %s'),
+        'tooltip' => mt('monitoring', '%d down on %s'),
         'color' => '#ff5566',
         'opacity' => '0.9'
     ),
     'cnt_unknown_hard' => array(
-        'tooltip' => t('%d unknown on %s'),
+        'tooltip' => mt('monitoring', '%d unknown on %s'),
         'color' => '#cc77ff',
         'opacity' => '0.7'
     ),
     'cnt_ok' => array(
-        'tooltip' => t('%d ok on %s'),
+        'tooltip' => mt('monitoring', '%d ok on %s'),
         'color' => '#49DF96',
         'opacity' => '0.55'
     )
@@ -71,7 +71,7 @@ if ($to - $from > 315360000) {
 $data = array();
 
 if (count($summary) === 0) {
-    echo t('No state changes in the selected time period.');
+    echo mt('monitoring', 'No state changes in the selected time period.');
 }
 foreach ($summary as $entry) {
     $day = $entry->day;

modules/monitoring/application/views/scripts/multi/host.phtml

@@ -10,7 +10,7 @@ $this->target = array('host'	=> $this->hostquery);
 
 <div class="content">
     <?php if (count($objects) === 0): ?>
-         <?= t('No hosts matching the filter'); ?>
+         <?= mt('monitoring', 'No hosts matching the filter'); ?>
     <?php else: ?>
     <h1> Summary for <?= count($objects) ?> hosts </h1>
     <?= $this->render('multi/components/objectlist.phtml'); ?>

modules/monitoring/application/views/scripts/multi/service.phtml

@@ -14,7 +14,7 @@ $this->target = array(
 
 <div class="content">
   <?php if (count($objects) === 0): ?>
-      <?= t('No services matching the filter'); ?>
+      <?= mt('monitoring', 'No services matching the filter'); ?>
   <?php else: ?>
   <h1> Summary for <?= count($objects) ?> services </h1>
 

modules/monitoring/application/views/scripts/show/contact.phtml

@@ -19,23 +19,23 @@
       </tr>
 <?php if ($contact->contact_email): ?>
       <tr>
-        <th><?= t('Email') ?></th>
+        <th><?= mt('monitoring', 'Email') ?></th>
         <td><?= sprintf('<a href="mailto:%1$s">%1$s</a>', $this->escape($contact->contact_email)) ?></td>
       </tr>
 <?php endif ?>
 <?php if ($contact->contact_pager): ?>
       <tr>
-        <th><?= t('Pager') ?></th>
+        <th><?= mt('monitoring', 'Pager') ?></th>
         <td><?= $this->escape($contact->contact_pager) ?></td>
       </tr>
 <?php endif ?>
       <tr>
-        <th><?= t('Hosts') ?></th>
+        <th><?= mt('monitoring', 'Hosts') ?></th>
         <td><?= $this->escape($contactHelper->contactFlags($contact, 'host')) ?><br />
         <?= $this->escape($contact->contact_notify_host_timeperiod) ?></td>
       </tr>
       <tr>
-        <th><?= t('Services') ?></th>
+        <th><?= mt('monitoring', 'Services') ?></th>
         <td><?= $this->escape($contactHelper->contactFlags($contact, 'service')) ?><br />
         <?= $this->escape($contact->contact_notify_service_timeperiod) ?></td>
       </tr>

modules/monitoring/library/Monitoring/Backend.php

@@ -71,7 +71,7 @@ class Backend implements Selectable, Queryable, ConnectionInterface
     {
         $config = IcingaConfig::module('monitoring', 'backends');
         if ($config->count() === 0) {
-            throw new ConfigurationError(t('No backend has been configured'));
+            throw new ConfigurationError(mt('monitoring', 'No backend has been configured'));
         }
         if ($backendName !== null) {
             $backendConfig = $config->get($backendName);
@@ -80,7 +80,7 @@ class Backend implements Selectable, Queryable, ConnectionInterface
             }
             if ((bool) $backendConfig->get('disabled', false) === true) {
                 throw new ConfigurationError(
-                    t('Configuration for backend %s available but backend is disabled'),
+                    mt('monitoring', 'Configuration for backend %s available but backend is disabled'),
                     $backendName
                 );
             }
@@ -92,7 +92,7 @@ class Backend implements Selectable, Queryable, ConnectionInterface
                 }
             }
             if ($backendName === null) {
-                throw new ConfigurationError(t('All backends are disabled'));
+                throw new ConfigurationError(mt('monitoring', 'All backends are disabled'));
             }
         }
         $resource = ResourceFactory::create($backendConfig->resource);

modules/monitoring/library/Monitoring/DataView/DataView.php

@@ -245,7 +245,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
         foreach ($sortColumns['columns'] as $column) {
             if (! $this->isValidFilterTarget($column)) {
                 throw new QueryException(
-                    t('The sort column "%s" is not allowed in "%s".'),
+                    mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
                     $column,
                     get_class($this)
                 );
@@ -336,7 +336,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
         if ($filter instanceof FilterMatch) {
             if (! $this->isValidFilterTarget($filter->getColumn())) {
                 throw new QueryException(
-                    t('The filter column "%s" is not allowed here.'),
+                    mt('monitoring', 'The filter column "%s" is not allowed here.'),
                     $filter->getColumn()
                 );
             }