diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-04 12:32:47 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-04 12:32:47 +0000 |
| commit | 0218e165825ef10e034b1784777c1d53cf789104 (patch) | |
| tree | 6e03d4a3ca1d6f644e7ae4ec9c14ecb239ae80ec /frontends/php/include | |
| parent | e9e80b1adb24d4c1cfffdc3e5837797a26c877cc (diff) | |
- [DEV-188] implemented sound on/off button in status of triggers screens (Artem)
- [ZBX-333] fixed export/import time issue (Artem)
- [ZBX-270] minor fix in code performance (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5817 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/export.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/frontends/php/include/export.inc.php b/frontends/php/include/export.inc.php index a4e3649c..c8f23a7a 100644 --- a/frontends/php/include/export.inc.php +++ b/frontends/php/include/export.inc.php @@ -461,7 +461,7 @@ zbx_xmlwriter_start_element ($memory,XML_TAG_ZABBIX_EXPORT); zbx_xmlwriter_write_attribute($memory, 'version', '1.0'); zbx_xmlwriter_write_attribute($memory, 'date', date('d.m.y')); - zbx_xmlwriter_write_attribute($memory, 'time', date('h.i')); + zbx_xmlwriter_write_attribute($memory, 'time', date('H.i')); zbx_xmlwriter_start_element ($memory,XML_TAG_HOSTS); foreach($hosts as $hostid => $val){ diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 3b13e2c8..1b2feaf5 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -1367,6 +1367,8 @@ 'S_ADD'=> 'Add', // tr_status.php + 'S_SOUND'=> 'Sound', + 'S_MUTE'=> 'Mute', 'S_STATUS_OF_TRIGGERS'=> 'Status of triggers', 'S_STATUS_OF_TRIGGERS_BIG'=> 'STATUS OF TRIGGERS', 'S_SHOW_ONLY_TRUE'=> 'Show only true', |