Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorDace Petra <dace.petra@zabbix.com>2022-06-03 09:50:00 +0300
committerDace Petra <dace.petra@zabbix.com>2022-06-03 09:50:00 +0300
commit9e31bc6fb582e857d459a56e697adbacbe498804 (patch)
treea5c7e372cf336a81042ae27af4a45c298a8076cf /ui
parenta38b1cecd976017c93a7a2d5c0f5fd903c3d65ba (diff)
..F....... [ZBX-10615] fixed missing translations context for strings used as headers in small tables
Diffstat (limited to 'ui')
-rw-r--r--ui/app/views/monitoring.widget.actionlog.view.php16
-rw-r--r--ui/app/views/monitoring.widget.problemhosts.view.php8
-rw-r--r--ui/app/views/monitoring.widget.problems.view.php34
-rw-r--r--ui/app/views/monitoring.widget.problemsbysv.view.php2
-rw-r--r--ui/app/views/monitoring.widget.web.view.php7
5 files changed, 46 insertions, 21 deletions
diff --git a/ui/app/views/monitoring.widget.actionlog.view.php b/ui/app/views/monitoring.widget.actionlog.view.php
index 0bfa5cbaa97..2b9f249de88 100644
--- a/ui/app/views/monitoring.widget.actionlog.view.php
+++ b/ui/app/views/monitoring.widget.actionlog.view.php
@@ -30,12 +30,20 @@ $sort_div = (new CSpan())
// create alert table
$table = (new CTableInfo())
->setHeader([
- ($data['sortfield'] === 'clock') ? [_('Time'), $sort_div] : _('Time'),
+ ($data['sortfield'] === 'clock')
+ ? [_x('Time', 'compact table header'), $sort_div]
+ : _x('Time', 'compact table header'),
_('Action'),
- ($data['sortfield'] === 'mediatypeid') ? [_('Type'), $sort_div] : _('Type'),
- ($data['sortfield'] === 'sendto') ? [_('Recipient'), $sort_div] : _('Recipient'),
+ ($data['sortfield'] === 'mediatypeid')
+ ? [_x('Type', 'compact table header'), $sort_div]
+ : _x('Type', 'compact table header'),
+ ($data['sortfield'] === 'sendto')
+ ? [_x('Recipient', 'compact table header'), $sort_div]
+ : _x('Recipient', 'compact table header'),
_('Message'),
- ($data['sortfield'] === 'status') ? [_('Status'), $sort_div] : _('Status'),
+ ($data['sortfield'] === 'status')
+ ? [_x('Status', 'compact table header'), $sort_div]
+ : _x('Status', 'compact table header'),
_('Info')
]);
diff --git a/ui/app/views/monitoring.widget.problemhosts.view.php b/ui/app/views/monitoring.widget.problemhosts.view.php
index 9d44a19125b..0331a70b819 100644
--- a/ui/app/views/monitoring.widget.problemhosts.view.php
+++ b/ui/app/views/monitoring.widget.problemhosts.view.php
@@ -28,10 +28,10 @@ $sort_div = (new CSpan())->addClass(ZBX_STYLE_ARROW_UP);
$table = (new CTableInfo())
->setHeader([
- [_('Host group'), $sort_div],
- _('Without problems'),
- _('With problems'),
- _('Total')
+ [_x('Host group', 'compact table header'), $sort_div],
+ _x('Without problems', 'compact table header'),
+ _x('With problems', 'compact table header'),
+ _x('Total', 'compact table header')
])
->setHeadingColumn(0);
diff --git a/ui/app/views/monitoring.widget.problems.view.php b/ui/app/views/monitoring.widget.problems.view.php
index 343738deadf..4db0e3bcffc 100644
--- a/ui/app/views/monitoring.widget.problems.view.php
+++ b/ui/app/views/monitoring.widget.problems.view.php
@@ -52,20 +52,32 @@ $show_opdata = $data['fields']['show_opdata'];
$table = (new CTableInfo())
->setHeader(array_merge($header, [
- $show_recovery_data ? _('Recovery time') : null,
- $show_recovery_data ? _('Status') : null,
- _('Info'),
- ($data['sortfield'] === 'host') ? [_('Host'), $sort_div] : _('Host'),
+ $show_recovery_data
+ ? _x('Recovery time', 'compact table header')
+ : null,
+ $show_recovery_data
+ ? _x('Status', 'compact table header')
+ : null, _x('Info', 'compact table header'),
+ _x('Info', 'compact table header'),
+ ($data['sortfield'] === 'host')
+ ? [_x('Host', 'compact table header'), $sort_div]
+ : _x('Host', 'compact table header'),
[
- ($data['sortfield'] === 'name') ? [_('Problem'), $sort_div] : _('Problem'),
+ ($data['sortfield'] === 'name')
+ ? [_x('Problem', 'compact table header'), $sort_div]
+ : _x('Problem', 'compact table header'),
' &bullet; ',
- ($data['sortfield'] === 'severity') ? [_('Severity'), $sort_div] : _('Severity')
+ ($data['sortfield'] === 'severity')
+ ? [_x('Severity', 'compact table header'), $sort_div]
+ : _x('Severity', 'compact table header')
],
- ($show_opdata == OPERATIONAL_DATA_SHOW_SEPARATELY) ? _('Operational data') : null,
- _('Duration'),
- _('Ack'),
- _('Actions'),
- $data['fields']['show_tags'] ? _('Tags') : null
+ ($show_opdata == OPERATIONAL_DATA_SHOW_SEPARATELY)
+ ? _x('Operational data', 'compact table header')
+ : null,
+ _x('Duration', 'compact table header'),
+ _x('Ack', 'compact table header'),
+ _x('Actions', 'compact table header'),
+ $data['fields']['show_tags'] ? _x('Tags', 'compact table header') : null
]));
$today = strtotime('today');
diff --git a/ui/app/views/monitoring.widget.problemsbysv.view.php b/ui/app/views/monitoring.widget.problemsbysv.view.php
index 33023d366f9..5ea95dd7bb2 100644
--- a/ui/app/views/monitoring.widget.problemsbysv.view.php
+++ b/ui/app/views/monitoring.widget.problemsbysv.view.php
@@ -37,7 +37,7 @@ else {
? $data['filter']['severities']
: range(TRIGGER_SEVERITY_NOT_CLASSIFIED, TRIGGER_SEVERITY_COUNT - 1);
- $header = [[_('Host group'), (new CSpan())->addClass(ZBX_STYLE_ARROW_UP)]];
+ $header = [[_x('Host group', 'compact table header'), (new CSpan())->addClass(ZBX_STYLE_ARROW_UP)]];
for ($severity = TRIGGER_SEVERITY_COUNT - 1; $severity >= TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity--) {
if (in_array($severity, $filter_severities)) {
diff --git a/ui/app/views/monitoring.widget.web.view.php b/ui/app/views/monitoring.widget.web.view.php
index 20ca344377f..5da4da8d284 100644
--- a/ui/app/views/monitoring.widget.web.view.php
+++ b/ui/app/views/monitoring.widget.web.view.php
@@ -27,7 +27,12 @@
$sort_div = (new CSpan())->addClass(ZBX_STYLE_ARROW_UP);
$table = (new CTableInfo())
- ->setHeader([[_('Host group'), $sort_div], _('Ok'), _('Failed'), _('Unknown')])
+ ->setHeader([
+ [_x('Host group', 'compact table header'), $sort_div],
+ _x('Ok', 'compact table header'),
+ _x('Failed', 'compact table header'),
+ _x('Unknown', 'compact table header')
+ ])
->setHeadingColumn(0);
$url = $data['allowed_ui_hosts']