diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml index 455514d0a..8f3fc7e45 100644 --- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml @@ -1,10 +1,10 @@ start <= time() && ! $downtime->is_in_effect): ?>
translate('ENDS', 'Downtime status'); ?>
-
timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
+
timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact, true) ?>
is_in_effect ? $this->translate('EXPIRES', 'Downtime status') : $this->translate('STARTS', 'Downtime status'); ?>
-
timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
+
timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact, true) ?>
@@ -47,7 +47,7 @@ )) ?> is_in_effect && $downtime->start >= time()): ?> - translate('expires %s'), $this->timeUntil($downtime->end)) ?> + translate('expires %s'), $this->timeUntil($downtime->end, false, true)) ?> is_flexible): ?> diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index 1dda0b70b..15d23f042 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -64,17 +64,17 @@ if (empty($object->comments) && ! $addLink) { if ((bool) $downtime->is_fixed) { $state = sprintf( $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'), - $this->timeUntil($downtime->start) + $this->timeUntil($downtime->start, false, true) ); } else { $state = sprintf( $this->translate('scheduled flexible %s', 'Last format parameter represents the time scheduled'), - $this->timeUntil($downtime->start) + $this->timeUntil($downtime->start, false, true) ); } $state .= ' ' . sprintf( $this->translate('expires %s', 'Last format parameter represents the downtime expire time'), - $this->timeUntil($downtime->end) + $this->timeUntil($downtime->end, false, true) ); } }