From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Wed, 28 Jan 2015 00:48:33 +0000 (-0500)
Subject: Adding autodetect language to preferences menu
X-Git-Tag: lulzbot-15.02.1-1.01~75^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0485695fd8f87741087d26732ace9fb50c611fe8;p=cura.git

Adding autodetect language to preferences menu
---

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index afdc764c..437a5875 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -486,7 +486,7 @@ setting('check_for_updates', 'False', bool, 'preference', 'hidden').setLabel(_("
 setting('submit_slice_information', 'False', bool, 'preference', 'hidden').setLabel(_("Send usage statistics"), _("Submit anonymous usage information to improve future versions of Cura"))
 setting('youmagine_token', '', str, 'preference', 'hidden')
 setting('filament_physical_density', '1240', float, 'preference', 'hidden').setRange(500.0, 3000.0).setLabel(_("Density (kg/m3)"), _("Weight of the filament per m3. Around 1240 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print."))
-setting('language', 'AUTO', str, 'preference', 'hidden').setLabel(_('Language'), _('Change the language in which Cura runs. Switching language requires a restart of Cura'))
+setting('language', 'Autodetect', str, 'preference', 'hidden').setLabel(_('Language'), _('Change the language in which Cura runs. Switching language requires a restart of Cura'))
 setting('active_machine', '0', int, 'preference', 'hidden')
 
 setting('model_colour', '#C9E240', str, 'preference', 'hidden').setLabel(_('Model colour'), _('Display color for first extruder'))
diff --git a/Cura/util/resources.py b/Cura/util/resources.py
index e5e42909..8e0bdf61 100644
--- a/Cura/util/resources.py
+++ b/Cura/util/resources.py
@@ -55,16 +55,20 @@ def setupLocalization(selectedLanguage = None):
 	#Default to english
 	languages = ['en']
 
-	if selectedLanguage is None or selectedLanguage == 'AUTO':
+	if selectedLanguage is not None:
+		for item in getLanguageOptions():
+			if item[1] == selectedLanguage and item[0] is not None:
+				languages = [item[0]]
+				break
+	if languages[0] == 'AUTO':
+		languages = ['en']
 		defaultLocale = getDefaultLocale()
 		if defaultLocale is not None:
 			for item in getLanguageOptions():
+				if item[0] == 'AUTO':
+					continue
 				if item[0] is not None and defaultLocale.startswith(item[0]):
 					languages = [item[0]]
-	else:
-		for item in getLanguageOptions():
-			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)
@@ -73,6 +77,7 @@ def setupLocalization(selectedLanguage = None):
 
 def getLanguageOptions():
 	return [
+		['AUTO', 'Autodetect'],
 		['en', 'English'],
 		['de', 'Deutsch'],
 		['fr', 'French'],