Adding autodetect language to preferences menu

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index afdc764c84cc172e5b3a1231ecf4dd7187b01a8c..437a58752099fdf3d2c4a4f091986beae0678ac2 100644 (file)
--- 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 e5e429091e728c2f99b216e709ba8adf145af359..8e0bdf615751223f8f6c2bb78dfb00dc422faaad 100644 (file)
--- 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'],