From 2987da6dcf693a8c6e44182d079fc4314f03e656 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Mon, 9 Nov 2015 16:54:56 +0100
Subject: [PATCH] Sets the languageComboBox to the default language

Fixes #CURA-327
---
 resources/qml/GeneralPage.qml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml
index aef53e1324..4de94adc38 100644
--- a/resources/qml/GeneralPage.qml
+++ b/resources/qml/GeneralPage.qml
@@ -13,6 +13,15 @@ UM.PreferencesPage
     //: General configuration page title
     title: catalog.i18nc("@title:tab","General");
 
+    function setDefaultLanguage(languageCode){
+        //loops trough the languageList and sets the language using the languageCode
+        for(var i = 0; i < languageList.count; i++){
+            if (languageComboBox.model.get(i).code == languageCode){
+                languageComboBox.currentIndex = i
+            }
+        }
+    }
+
     function reset()
     {
         UM.Preferences.resetPreference("general/language")
@@ -22,7 +31,8 @@ UM.PreferencesPage
         pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
         sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
         scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
-        languageComboBox.currentIndex = 0
+        var defaultLanguage = UM.Preferences.getValue("general/language")
+        setDefaultLanguage(defaultLanguage)
     }
 
     GridLayout