diff --git a/application/layouts/scripts/parts/topbar.phtml b/application/layouts/scripts/parts/topbar.phtml index 39d559f57..68f919951 100644 --- a/application/layouts/scripts/parts/topbar.phtml +++ b/application/layouts/scripts/parts/topbar.phtml @@ -32,7 +32,7 @@ translate('Preferences'); ?>
  • - translate('Logout'); ?> + translate('Logout'); ?>
  • diff --git a/application/views/scripts/joystickPagination.phtml b/application/views/scripts/joystickPagination.phtml index 27cafa309..a89d2601d 100644 --- a/application/views/scripts/joystickPagination.phtml +++ b/application/views/scripts/joystickPagination.phtml @@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) { return; // Display this pagination only if there are multiple pages } -$fromTo = t('%s: %d to %d of %d'); +$fromTo = t('%s: %d to %d of %d (on the %s-axis)'); $xAxisPages = $xAxisPaginator->getPages('all'); $yAxisPages = $yAxisPaginator->getPages('all'); @@ -35,7 +35,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 : t('Hosts'), ($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1, $prevYAxisPage * $yAxisPages->itemCountPerPage, - $yAxisPages->totalItemCount + $yAxisPages->totalItemCount, + 'y' ); ?>">icon('up-open'); ?> icon('up-open'); ?> @@ -53,7 +54,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 : t('Services'), ($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1, $prevXAxisPage * $xAxisPages->itemCountPerPage, - $xAxisPages->totalItemCount + $xAxisPages->totalItemCount, + 'x' ); ?>">icon('left-open'); ?> icon('left-open'); ?> @@ -69,7 +71,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 : t('Services'), $currentXAxisPage * $xAxisPages->itemCountPerPage + 1, $nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage, - $xAxisPages->totalItemCount + $xAxisPages->totalItemCount, + 'x' ); ?>">icon('right-open'); ?> icon('right-open'); ?> @@ -87,7 +90,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 : t('Hosts'), $currentYAxisPage * $yAxisPages->itemCountPerPage + 1, $nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage, - $yAxisPages->totalItemCount + $yAxisPages->totalItemCount, + 'y' ); ?>">icon('down-open'); ?> icon('down-open'); ?> diff --git a/application/views/scripts/pivottablePagination.phtml b/application/views/scripts/pivottablePagination.phtml index 52bcb0351..ce180146e 100644 --- a/application/views/scripts/pivottablePagination.phtml +++ b/application/views/scripts/pivottablePagination.phtml @@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) { return; // Display this pagination only if there are multiple pages } -$fromTo = t('%s: %d to %d of %d'); +$fromTo = t('%s: %d to %d of %d (on the %s-axis)'); $xAxisPages = $xAxisPaginator->getPages('all'); $yAxisPages = $yAxisPaginator->getPages('all'); @@ -28,13 +28,15 @@ $yAxisPages = $yAxisPaginator->getPages('all'); t('Hosts'), ($yAxisPage - 1) * $yAxisPages->itemCountPerPage + 1, $yAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $yAxisPage * $yAxisPages->itemCountPerPage, - $yAxisPages->totalItemCount + $yAxisPages->totalItemCount, + 'y' ) . '; ' . sprintf( $fromTo, t('Services'), ($xAxisPage - 1) * $xAxisPages->itemCountPerPage + 1, $xAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $xAxisPage * $xAxisPages->itemCountPerPage, - $xAxisPages->totalItemCount + $xAxisPages->totalItemCount, + 'x' ); ?>"> diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml index 925cdfa4e..758376c53 100644 --- a/application/views/scripts/roles/index.phtml +++ b/application/views/scripts/roles/index.phtml @@ -52,7 +52,10 @@ escape($role->groups) ?> + title="translate('Remove role %s'), + $name + ) ?>"> icon('cancel') ?> diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index dbe395b28..3235a7012 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -147,7 +147,7 @@ class Monitoring_HostsController extends Controller $this->view->objectsInDowntime = $objectsInDowntime; $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes') ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString()); - $this->view->havingCommentsLink = Url::fromRequest() + $this->view->commentsLink = Url::fromRequest() ->setPath('monitoring/list/comments'); $this->view->hostStatesPieChart = $this->createPieChart( $hostStates, diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php index 88df52e46..467f04bec 100644 --- a/modules/monitoring/application/controllers/ServicesController.php +++ b/modules/monitoring/application/controllers/ServicesController.php @@ -191,7 +191,7 @@ class Monitoring_ServicesController extends Controller $this->view->objectsInDowntime = $objectsInDowntime; $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes') ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString()); - $this->view->havingCommentsLink = Url::fromRequest() + $this->view->commentsLink = Url::fromRequest() ->setPath('monitoring/list/comments'); $this->view->serviceStatesPieChart = $this->createPieChart( $serviceStates, diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml index 7f8d775ab..5e4674523 100644 --- a/modules/monitoring/application/views/scripts/hosts/show.phtml +++ b/modules/monitoring/application/views/scripts/hosts/show.phtml @@ -17,7 +17,10 @@
    - + translate('List all') ?>
    @@ -60,17 +63,43 @@ ) ?>
    - + icon('plug') ?> - translate('Schedule downtimes for unhandled problem hosts') ?> + translatePlural( + 'Schedule downtime for unhandled host problem', + 'Schedule downtimes for unhandled host problems', + $unhandledCount + ), + $unhandledCount + ) ?>
    - + icon('ok') ?> - translate('Acknowledge unhandled problem hosts') ?> + translatePlural( + 'Acknowledge unhandled host problem', + 'Acknowledge unhandled host problems', + $unhandledCount + ), + $unhandledCount + ) ?>
    @@ -96,12 +125,19 @@

    + title="translatePlural( + 'List %u host which is in downtime', + 'List %u hosts which are in downtime', + $inDowntimeCount + ), + $inDowntimeCount + ) ?>"> icon('plug') ?> translatePlural( - '%u host is in downtime', - '%u hosts are in downtime', + 'List %u host currently in downtime', + 'List %u hosts currently downtime', $inDowntimeCount ), $inDowntimeCount @@ -110,19 +146,26 @@

    - getComments()) ?> - + getComments()) ?> +

    - + icon('comment') ?> translatePlural( - '%u comment', - '%u comments', - $havingCommentsCount + 'List %u host comment', + 'List %u host comments', + $commentCount ), - $havingCommentsCount + $commentCount ) ?>

    diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 7d67c9d3a..0c5989bff 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -96,7 +96,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services OK'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status ok in host group %s', + 'List %u services with status ok in host group %s', + $h->services_ok + ), + $h->services_ok, + $h->hostgroup + ); ?>"> services_ok; ?> @@ -113,7 +121,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services CRITICAL Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status critical unhandled in host group %s', + 'List %u services with status critical unhandled in host group %s', + $h->services_critical_unhandled + ), + $h->services_critical_unhandled, + $h->hostgroup + ); ?>"> services_critical_unhandled; ?> @@ -127,7 +143,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services CRITICAL Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status critical handled in host group %s', + 'List %u services with status critical handled in host group %s', + $h->services_critical_handled + ), + $h->services_critical_handled, + $h->hostgroup + ); ?>"> services_critical_handled; ?> @@ -147,7 +171,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services UNKNOWN Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status unknown unhandled in host group %s', + 'List %u services with status unknown unhandled in host group %s', + $h->services_unknown_unhandled + ), + $h->services_unknown_unhandled, + $h->hostgroup + ); ?>"> services_unknown_unhandled; ?> @@ -161,7 +193,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services UNKNOWN Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status unknown handled in host group %s', + 'List %u services with status unknown handled in host group %s', + $h->services_unknown_handled + ), + $h->services_unknown_handled, + $h->hostgroup + ); ?>"> services_unknown_handled; ?> @@ -181,7 +221,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services WARNING Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status warning unhandled in host group %s', + 'List %u services with status warning unhandled in host group %s', + $h->services_warning_unhandled + ), + $h->services_warning_unhandled, + $h->hostgroup + ); ?>"> services_warning_unhandled; ?> @@ -195,7 +243,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services WARNING Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status warning handled in host group %s', + 'List %u services with status warning handled in host group %s', + $h->services_warning_handled + ), + $h->services_warning_handled, + $h->hostgroup + ); ?>"> services_warning_handled; ?> @@ -212,7 +268,15 @@ 'hostgroup' => $h->hostgroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services PENDING'); ?>"> + ); ?>" title="translatePlural( + 'List %u service with status pending in host group %s', + 'List %u services with status pending in host group %s', + $h->services_pending + ), + $h->services_pending, + $h->hostgroup + ); ?>"> services_pending; ?> diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index ea570a389..07410ddc7 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -98,19 +98,29 @@ if ($hosts->count() === 0) { escape($host->host_display_name) ?> host_unhandled_services) && $host->host_unhandled_services > 0): ?> - (qlink( - sprintf( - $this->translatePlural('%d unhandled service', '%d unhandled services', $host->host_unhandled_services), - $host->host_unhandled_services), - 'monitoring/show/services', - array( - 'host' => $host->host_name, - 'service_problem' => 1, - 'service_handled' => 0 + ), + 'monitoring/show/services', + array( + 'host' => $host->host_name, + 'service_problem' => 1, + 'service_handled' => 0 ), - array('style' => 'font-weight: normal') + array( + 'style' => 'font-weight: normal', + 'title' => sprintf( + $this->translatePlural( + 'List %s service problem on host %s', + 'List %s service problems on host %s', + $host->host_unhandled_services + ), + $host->host_unhandled_services, + $host->host_name + ) + ) ) ?>)

    escape($this->ellipsis($host->host_output, 10000)) ?>

    diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index 0e180bfa7..04e6975e1 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -96,7 +96,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services OK'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status ok in service group %s', + 'List %s Services with status ok in service group %s', + $s->services_ok + ), + $s->services_ok, + $s->servicegroup + ); ?>"> services_ok; ?> @@ -113,7 +121,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services CRITICAL Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status critical unhandled in service group %s', + 'List %s Services with status critical unhandled in service group %s', + $s->services_critical_unhandled + ), + $s->services_critical_unhandled, + $s->servicegroup + ); ?>"> services_critical_unhandled; ?> @@ -127,7 +143,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services CRITICAL Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status critical handled in service group %s', + 'List %s services with status critical handled in service group %s', + $s->services_critical_handled + ), + $s->services_critical_handled, + $s->servicegroup + ); ?>"> services_critical_handled; ?> @@ -147,7 +171,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services UNKNOWN Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status unknown unhandled in service group %s', + 'List %s services with status unknown unhandled in service group %s', + $s->services_unknown_unhandled + ), + $s->services_unknown_unhandled, + $s->servicegroup + ); ?>"> services_unknown_unhandled; ?> @@ -161,7 +193,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services UNKNOWN Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status unknown handled in service group %s', + 'List %s services with status unknown handled in service group %s', + $s->services_unknown_handled + ), + $s->services_unknown_handled, + $s->servicegroup + ); ?>"> services_unknown_handled; ?> @@ -181,7 +221,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services WARNING Unhandled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status warning unhandled in service group %s', + 'List %s services with status warning unhandled in service group %s', + $s->services_warning_unhandled + ), + $s->services_warning_unhandled, + $s->servicegroup + ); ?>"> services_warning_unhandled; ?> @@ -195,7 +243,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services WARNING Handled'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status warning handled in service group %s', + 'List %s services with status warning handled in service group %s', + $s->services_warning_handled + ), + $s->services_warning_handled, + $s->servicegroup + ); ?>"> services_warning_handled; ?> @@ -212,7 +268,15 @@ 'servicegroup' => $s->servicegroup, 'sort' => 'service_severity' ) - ); ?>" title="translate('Services PENDING'); ?>"> + ); ?>" title="translatePlural( + 'List %s service with status pending in service group %s', + 'List %s services with status pending in service group %s', + $s->services_pending + ), + $s->services_pending, + $s->servicegroup + ); ?>"> services_pending; ?> diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml index d5d9df2d9..229d63f0d 100644 --- a/modules/monitoring/application/views/scripts/services/show.phtml +++ b/modules/monitoring/application/views/scripts/services/show.phtml @@ -7,7 +7,7 @@
    - + translate('List all') ?>
    @@ -51,17 +51,43 @@ ) ?>
    - + icon('plug') ?> - translate('Schedule downtimes for unhandled problem services') ?> + translatePlural( + 'Schedule downtime for unhandled service problem', + 'Schedule downtimes for unhandled service problems', + $unhandledCount + ), + $unhandledCount + ) ?>
    - + icon('ok') ?> - translate('Acknowledge unhandled problem services') ?> + translatePlural( + 'Acknowledge unhandled service problem', + 'Acknowledge unhandled service problems', + $unhandledCount + ), + $unhandledCount + ) ?>
    @@ -86,13 +112,18 @@

    - + icon('plug') ?> translatePlural( - '%u service is in downtime', - '%u services are in downtime', + 'List %u service currently in downtime', + 'List %u services currently in downtime', $inDowntimeCount ), $inDowntimeCount @@ -101,19 +132,25 @@

    - getComments()) ?> - + getComments()) ?> +

    - + icon('comment') ?> translatePlural( - '%u comment', - '%u comments', - $havingCommentsCount + 'List %u service comment', + 'List %u service comments', + $commentCount ), - $havingCommentsCount + $commentCount ) ?>