From f967bed370ba8a89528e766a0dce623d03ab7094 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 12 May 2020 18:03:59 +0200 Subject: [PATCH] Locale lib sometimes miserably fails to parse locale ~.~ --- moulinette/interfaces/cli.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/moulinette/interfaces/cli.py b/moulinette/interfaces/cli.py index 804028bc..aa339866 100644 --- a/moulinette/interfaces/cli.py +++ b/moulinette/interfaces/cli.py @@ -169,8 +169,13 @@ def pretty_print_dict(d, depth=0): def get_locale(): - """Return current user locale""" - lang = locale.getdefaultlocale()[0] + """Return current user eocale""" + try: + lang = locale.getdefaultlocale()[0] + except Exception: + # In some edge case the locale lib fails ... + # c.f. https://forum.yunohost.org/t/error-when-trying-to-enter-user-information-in-admin-panel/11390/11 + lang = os.getenv('LANG') if not lang: return "" return lang[:2]