[checkmk-commits] Check_MK Git: check_mk: Multisite: Made hardcoded english language choosable in language selections

Module: check_mk Branch: master Commit: a465eeb10539aa2d7b6a9a9b22867efe2b930e81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a465eeb10539aa… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Jan 31 09:45:04 2012 +0100 Multisite: Made hardcoded english language choosable in language selections --- web/htdocs/lib.py | 5 ++++- web/htdocs/wato.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index a25717c..0bc28e9 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -136,7 +136,10 @@ def get_language_alias(lang): return alias def get_languages(): - languages = [] + # Add the hard coded english language to the language list + # It must be choosable even if the administrator changed the default + # language to a custom value + languages = [ (None, _('English')) ] for lang_dir in get_language_dirs(): try: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c21f42c..59df3c3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9193,7 +9193,7 @@ def page_user_profile(): html.write("</td><td class=checkbox>") html.checkbox('_set_lang', active, onclick = 'wato_toggle_attribute(this, \'language\')') html.write("</td><td class=content>") - default_label = _('Default: %s') % (get_language_alias(config.default_language) or 'english') + default_label = _('Default: %s') % (get_language_alias(config.default_language) or _('English')) html.write('<div class="inherited" id="attr_default_language" style="%s">%s</div>' % (active and "display: none" or "", default_label)) html.write('<div id="attr_entry_language" style="%s">' % ((not active) and "display: none" or ""))