Merge branch 'develop' into 1459_linux_packaging

This commit is contained in:
Micah Lee 2021-11-14 13:28:45 -08:00
commit d53d52a163
3 changed files with 16 additions and 19 deletions

View file

@ -43,7 +43,11 @@ def load_strings(common, locale_dir):
current_locale = common.settings.get("locale")
strings = {}
for s in translations[default_locale]:
if s in translations[current_locale] and translations[current_locale][s] != "":
if (
current_locale in translations
and s in translations[current_locale]
and translations[current_locale][s] != ""
):
strings[s] = translations[current_locale][s]
else:
strings[s] = translations[default_locale][s]