From 311ebfbcbac2a961c41ce12c1d988fc37c754a01 Mon Sep 17 00:00:00 2001
From: Carlos Cesario <carloscesario@gmail.com>
Date: Wed, 10 Dec 2014 10:44:45 -0200
Subject: [PATCH] Add support to untranslated strings

Add support to untranslated strings

refs #7988
---
 .../application/controllers/AlertsummaryController.php      | 6 +++---
 .../monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml      | 6 +++---
 .../monitoring/application/views/scripts/process/info.phtml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 75f0fc1fe..fdb1ec99f 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -193,11 +193,11 @@ class Monitoring_AlertsummaryController extends Controller
 
         $out = new stdClass();
         if ($yesterday === $today) {
-            $out->trend = 'unchanged';
+            $out->trend = $this->translate('unchanged');
         } elseif ($yesterday > $today) {
-            $out->trend = 'down';
+            $out->trend = $this->translate('down');
         } else {
-            $out->trend = 'up';
+            $out->trend = $this->translate('up');
         }
 
         if ($yesterday <= 0) {
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 4f92a25b1..35dcd811f 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -605,7 +605,7 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
 
         $this->setupSortControl(array(
-            'timestamp' => 'Occurence'
+            'timestamp' => $this->translate('Occurence')
         ));
         $this->view->history = $query->paginate();
     }
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 588d39712..d7d700185 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -42,7 +42,7 @@ if ($hosts->count() === 0) {
   <?php foreach($hosts as $host):
 
     $hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
-    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
+    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_display_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 365d32f56..28c71c0b8 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -56,7 +56,7 @@ foreach ($notifications as $notification):
     </td>
     <td style="font-size: 0.8em">
       <?php if ($isService): ?>
-        <a href="<?= $href ?>"><?= $notification->service ?></a> on <?= $notification->host ?>
+        <?= sprintf($this->translate('%s on %s'), "<a href=\"$href\">$notification->service</a>", $notification->host); ?>
       <?php else: ?>
         <a href="<?= $href ?>"><?= $notification->host ?></a>
       <?php endif; ?>
@@ -65,10 +65,10 @@ foreach ($notifications as $notification):
       <br />
       <?php if (!$this->contact): ?>
       <small>
-          Sent to <a href="<?= $this->href(
+          <?= sprintf($this->translate('Sent to %s'), "<a href=\"$this->href(
               'monitoring/show/contact',
               array('contact' => $notification->notification_contact)
-          ) ?>"><?= $this->escape($notification->notification_contact) ?></a>
+          )\">$this->escape($notification->notification_contact)</a>"); ?>
       </small>
       <?php endif ?>
     </td>
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 02b8eeb80..92bb6cb63 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -26,11 +26,11 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Status Update'); ?></th>
-                    <td><?= $this->timeSince($this->programStatus->status_update_time) ?> ago</td>
+                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->status_update_time)); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last External Command Check'); ?></th>
-                    <td><?= $this->timeSince($this->programStatus->last_command_check) ?> ago</td>
+                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->last_command_check)); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Log File Rotation'); ?></th>