[checkmk-commits] 3468 FIX Fix changing a user' s language back to English if the default is German

Module: check_mk Branch: master Commit: 684f0d02c65bd279554ad3ff7436ef62200d1a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=684f0d02c65bd2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 4 14:40:58 2016 +0200 3468 FIX Fix changing a user's language back to English if the default is German If the global language setting was German then a user could not set this back to English. This has been fixed. --- .werks/3468 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/config.py | 9 ++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/3468 b/.werks/3468 new file mode 100644 index 0000000..4621a69 --- /dev/null +++ b/.werks/3468 @@ -0,0 +1,11 @@ +Title: Fix changing a user's language back to English if the default is German +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462365605 + +If the global language setting was German then a user could not set this +back to English. This has been fixed. diff --git a/ChangeLog b/ChangeLog index ceaa7c4..9b49ac1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 3453 FIX: apache_status: Fixed wrong graph labels and improved wordings * 3454 FIX: Fixed scaling of numbers in graphs (e.g. inodes of filesystems) * 3462 FIX: Fixed ineffective localizations on werk page after language change + * 3468 FIX: Fix changing a user's language back to English if the default is German... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index d3df6d3..f9484d1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -318,9 +318,12 @@ def set_user_confdir(user_id): make_nagios_directory(user_confdir) def get_language(default = None): - if default == None: - default = default_language - return user and user.get('language', default) or default + if "language" in user: + return user["language"] + elif default == None: + return default_language + else: + return default def hide_language(lang): return lang in hide_languages