[checkmk-commits] 4424 FIX Fixed user language selection showing wrong language after change

Module: check_mk Branch: master Commit: 78406d6adc85dece880986b4954fa83f33f3d795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78406d6adc85de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 09:36:26 2017 +0100 4424 FIX Fixed user language selection showing wrong language after change Change-Id: Ied4dee2a93ac75ce30e01ea7e326bd7451d24dbc --- .werks/4424 | 11 +++++++++++ web/htdocs/i18n.py | 2 +- web/htdocs/wato.py | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4424 b/.werks/4424 new file mode 100644 index 0000000..872d245 --- /dev/null +++ b/.werks/4424 @@ -0,0 +1,11 @@ +Title: Fixed user language selection showing wrong language after change +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488875764 + + diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index f922f66..30764ee 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -64,7 +64,7 @@ def get_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 = set([ (None, _('English')) ]) + languages = set([ ('', _('English')) ]) for lang_dir in get_language_dirs(): try: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a176e3d..46d20a0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13929,7 +13929,8 @@ def select_language(user): html.div(default_label, class_="inherited", id_="attr_default_language", style= "display: none" if active else "") html.open_div(id_="attr_entry_language", style="display: none" if not active else "") - html.select("language", languages, user.get('language') or '') + language = user.get('language') if user.get('language') != None else '' + html.select("language", languages, language) html.close_div() html.help(_('Configure the default language ' 'to be used by the user in the user interface here. If you do not check '