From dc6a888576b145fc81c4d9d53bcbcf7acc404b0a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Fri, 10 Jun 2022 19:14:18 +0100 Subject: [PATCH 1/2] fix/allow_LF_lang_to_be_None --- ovos_utils/configuration.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ovos_utils/configuration.py b/ovos_utils/configuration.py index fc87b7d9..acc09260 100644 --- a/ovos_utils/configuration.py +++ b/ovos_utils/configuration.py @@ -52,9 +52,10 @@ def get_default_lang(config=None): The language code for the default language. """ if _lf_get_default_lang: - return _lf_get_default_lang() - config = config or read_mycroft_config() - default_lang = config.get("lang") or "en-us" + default_lang = _lf_get_default_lang() + if not default_lang: + config = config or read_mycroft_config() + default_lang = config.get("lang") or "en-us" return default_lang From d869d1ae747534015efa27b058eb8c6866dfe8d1 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Fri, 10 Jun 2022 19:23:17 +0100 Subject: [PATCH 2/2] Update configuration.py --- ovos_utils/configuration.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ovos_utils/configuration.py b/ovos_utils/configuration.py index acc09260..c7bb988f 100644 --- a/ovos_utils/configuration.py +++ b/ovos_utils/configuration.py @@ -51,12 +51,13 @@ def get_default_lang(config=None): Returns: The language code for the default language. """ + default_lang = None if _lf_get_default_lang: default_lang = _lf_get_default_lang() if not default_lang: config = config or read_mycroft_config() - default_lang = config.get("lang") or "en-us" - return default_lang + default_lang = config.get("lang") + return default_lang or "en-us" def get_ovos_config():