From 4589621f58e1127db7e0309c2a55bf0017ababc5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:57:44 +0100
Subject: [PATCH] monitoring: Use host and service display_name for displaying
 host and service names for an object's history

refs #7843
---
 .../views/scripts/show/history.phtml          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 728b9bfc1..a0cc4944e 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -136,13 +136,18 @@ $output = $this->tickets ? preg_replace_callback(
 
 ?>
         <?php if ($isService): ?>
-          <?= $hostContext ? $this->qlink(
-            $this->escape($event->service_description),
-            'monitoring/show/service',
-            array(
-              'host' => $event->host_name,
-              'service' => $event->service_description)
-            ) : $this->escape($event->service_description); ?> <?= $this->translate('on') . ' ' . $this->escape($event->host_name); ?>
+          <?= sprintf(
+              $this->translate('%s on %s', 'Service running on host'),
+              $hostContext ? $this->qlink(
+                  $this->escape($event->service_display_name),
+                  'monitoring/show/service',
+                  array(
+                      'host' => $event->host_name,
+                      'service' => $event->service_description
+                  )
+              ) : $this->escape($event->service_display_name),
+              $event->host_display_name
+          ) ?>
         <?php else: ?>
           <?= $this->escape($event->host_name); ?>
         <?php endif ?>