Merge pull request #2342 from hroncok/localefix

Relocate locales to proper locations

resources/qml/Preferences/GeneralPage.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.1
@@ -148,25 +148,25 @@ UM.PreferencesPage
                         id: languageList
 
                         Component.onCompleted: {
-                            append({ text: "English", code: "en" })
-                            append({ text: "Deutsch", code: "de" })
-                            append({ text: "Español", code: "es" })
-                            append({ text: "Suomi", code: "fi" })
-                            append({ text: "Français", code: "fr" })
-                            append({ text: "Italiano", code: "it" })
-                            append({ text: "日本語", code: "jp" })
-                            append({ text: "한국어", code: "ko" })
-                            append({ text: "Nederlands", code: "nl" })
-                            append({ text: "Polski", code: "pl" })
-                            append({ text: "Português do Brasil", code: "ptbr" })
-                            append({ text: "Русский", code: "ru" })
-                            append({ text: "Türkçe", code: "tr" })
+                            append({ text: "English", code: "en_US" })
+                            append({ text: "Deutsch", code: "de_DE" })
+                            append({ text: "Español", code: "es_ES" })
+                            append({ text: "Suomi", code: "fi_FI" })
+                            append({ text: "Français", code: "fr_FR" })
+                            append({ text: "Italiano", code: "it_IT" })
+                            append({ text: "日本語", code: "ja_JP" })
+                            append({ text: "한국어", code: "ko_KR" })
+                            append({ text: "Nederlands", code: "nl_NL" })
+                            append({ text: "Polski", code: "pl_PL" })
+                            append({ text: "Português do Brasil", code: "pt_BR" })
+                            append({ text: "Русский", code: "ru_RU" })
+                            append({ text: "Türkçe", code: "tr_TR" })
                             append({ text: "简体中文", code: "zh_CN" })
 
                             var date_object = new Date();
                             if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.
                             {
-                                append({ text: "Pirate", code: "7s" })
+                                append({ text: "Pirate", code: "en_7S" })
                             }
                         }
                     }