Module: check_mk
Branch: master
Commit: c0a3ba44a1c30aec5bd6340c5e851c12014ffbaf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a3ba44a1c30a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Feb 10 14:44:41 2014 +0100
Fixed bookmark icon images for non-english user languages
---
.werks/278 | 8 ++++++++
ChangeLog | 1 +
web/plugins/sidebar/shipped.py | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.werks/278 b/.werks/278
new file mode 100644
index 0000000..119d2a7
--- /dev/null
+++ b/.werks/278
@@ -0,0 +1,8 @@
+Title: Fixed bookmark icon images for non-english user languages
+Level: 1
+Component: multisite
+Version: 1.2.5i1
+Date: 1392039717
+Class: fix
+
+Using a language different than english caused the bookmark delete and edit images to
vanish.
diff --git a/ChangeLog b/ChangeLog
index 01e95e2..0397135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -210,6 +210,7 @@
* 0270 FIX: Multisite host tag filter: Now uses exact match...
* 0273 FIX: Fixed exceptions when modifying / cloning views...
* 0274 FIX: Fixed exception when view title or description was missing
+ * 0278 FIX: Fixed bookmark icon images for non-english user languages...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index 833b17f..d54b84d 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -974,8 +974,8 @@ def render_bookmarks():
n = 0
for title, href in bookmarks:
html.write("<div class=bookmark id=\"bookmark_%d\">" %
n)
- iconbutton(_("delete"), "del_bookmark.py?num=%d" % n,
"side", "updateContents", 'snapin_bookmarks', css_class =
'bookmark')
- iconbutton(_("edit"), "edit_bookmark.py?num=%d" % n,
"main", css_class = 'bookmark')
+ iconbutton("delete", "del_bookmark.py?num=%d" % n,
"side", "updateContents", 'snapin_bookmarks', css_class =
'bookmark')
+ iconbutton("edit", "edit_bookmark.py?num=%d" % n,
"main", css_class = 'bookmark')
html.write(link(title, href))
html.write("</div>")
n += 1