tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support to untranslated strings 

Add support to untranslated strings

refs #7988
This commit is contained in:
Carlos Cesario 2014-12-10 10:44:45 -02:00
parent 196b6a4875
commit 311ebfbcba
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -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) {

2
modules/monitoring/application/controllers/ListController.php
View File

@ -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();
}

2
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -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){

6
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -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>

4
modules/monitoring/application/views/scripts/process/info.phtml
View File

@ -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>