Merge pull request #2342 from hroncok/localefix

Relocate locales to proper locations

.gitignore

@@ -5,8 +5,8 @@ __pycache__
 *.mo
 docs/html
 *.log
-resources/i18n/en
-resources/i18n/7s
+resources/i18n/en_US
+resources/i18n/en_7S
 resources/i18n/x-test
 resources/firmware
 resources/materials

plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py

@@ -9,6 +9,23 @@ from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
 _renamed_themes = {
     "cura": "cura-light"
 }
+_renamed_i18n = {
+    "7s": "en_7S",
+    "de": "de_DE",
+    "en": "en_US",
+    "es": "es_ES",
+    "fi": "fi_FI",
+    "fr": "fr_FR",
+    "hu": "hu_HU",
+    "it": "it_IT",
+    "jp": "ja_JP",
+    "ko": "ko_KR",
+    "nl": "nl_NL",
+    "pl": "pl_PL",
+    "ptbr": "pt_BR",
+    "ru": "ru_RU",
+    "tr": "tr_TR"
+}
 
 class VersionUpgrade27to30(VersionUpgrade):
     ##  Gets the version number from a CFG file in Uranium's 2.7 format.
@@ -50,6 +67,11 @@ class VersionUpgrade27to30(VersionUpgrade):
             if parser["general"]["theme"] in _renamed_themes:
                 parser["general"]["theme"] = _renamed_themes[parser["general"]["theme"]]
 
+        #Renamed languages.
+        if "language" in parser["general"]:
+            if parser["general"]["language"] in _renamed_i18n:
+                parser["general"]["language"] = _renamed_i18n[parser["general"]["language"]]
+
         # Re-serialise the file.
         output = io.StringIO()
         parser.write(output)

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" })
                             }
                         }
                     }