From 1f7654ba3b4f84619016fbfb889cd06b36f1df7b Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 4 Oct 2013 09:30:22 +0200 Subject: [PATCH] Possibly fix the language selection problem where english defaults to system default. And add a system default language setting. --- Cura/util/resources.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cura/util/resources.py b/Cura/util/resources.py index 7b7c48c9..8d744c1f 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -56,8 +56,8 @@ def setupLocalization(selectedLanguage = None): if selectedLanguage is not None: for item in getLanguageOptions(): - if item[1] == selectedLanguage: - languages = [item[0]] + languages + if item[1] == selectedLanguage and item[0] is not None: + languages = [item[0]] locale_path = os.path.normpath(os.path.join(resourceBasePath, 'locale')) translation = gettext.translation('Cura', locale_path, languages, fallback=True) @@ -65,6 +65,7 @@ def setupLocalization(selectedLanguage = None): def getLanguageOptions(): return [ + [None, 'System default'], ['en', 'English'], ['de', 'Deutsch'], ['fr', 'French'], -- 2.30.2