From 7744712f39bfa45c3265b69b93f41e38efad1e5a Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Thu, 8 Oct 2020 11:06:56 +0200
Subject: [PATCH] Fix language choose

---
 res/ui/languages/da.svg    |  74 ++++++------
 src/js/languages.js        | 233 +++++++++++++++++++------------------
 src/js/states/main_menu.js |  27 +++--
 translations/base-cz.yaml  |   3 +-
 4 files changed, 174 insertions(+), 163 deletions(-)

diff --git a/res/ui/languages/da.svg b/res/ui/languages/da.svg
index ea9d950a..b6ace9ab 100644
--- a/res/ui/languages/da.svg
+++ b/res/ui/languages/da.svg
@@ -1,36 +1,38 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#FF4B55;" d="M400,0H112C50.144,0,0,50.144,0,112v288c0,61.856,50.144,112,112,112h288  c61.856,0,112-50.144,112-112V112C512,50.144,461.856,0,400,0z"/>
-<polygon style="fill:#F5F5F5;" points="512,229.517 211.862,229.517 211.862,0 158.897,0 158.897,229.517 0,229.517 0,282.483   158.897,282.483 158.897,512 211.862,512 211.862,282.483 512,282.483 "/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<rect style="fill:#FF4B55;" width="512" height="512"/>
+<polygon style="fill:#F5F5F5;" points="512,229.517 211.862,229.517 211.862,0 158.897,0 158.897,229.517 0,229.517 0,282.483 
+	158.897,282.483 158.897,512 211.862,512 211.862,282.483 512,282.483 "/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/src/js/languages.js b/src/js/languages.js
index c46c3e88..46ff8af9 100644
--- a/src/js/languages.js
+++ b/src/js/languages.js
@@ -1,113 +1,120 @@
-/**
- * @type {Object<string, {name: string, data: any, code: string, region: string}>}
- */
-export const LANGUAGES = {
-    "en": {
-        name: "English",
-        data: null,
-        code: "en",
-        region: "",
-    },
-    "de": {
-        name: "Deutsch",
-        data: require("./built-temp/base-de.json"),
-        code: "de",
-        region: "",
-    },
-    "fr": {
-        name: "Français",
-        data: require("./built-temp/base-fr.json"),
-        code: "fr",
-        region: "",
-    },
-    "ja": {
-        name: "日本語",
-        data: require("./built-temp/base-ja.json"),
-        code: "ja",
-        region: "",
-    },
-    "pt-PT": {
-        name: "Português (Portugal)",
-        data: require("./built-temp/base-pt-PT.json"),
-        code: "pt",
-        region: "PT",
-    },
-    "pt-BR": {
-        name: "Português (Brasil)",
-        data: require("./built-temp/base-pt-BR.json"),
-        code: "pt",
-        region: "BR",
-    },
-    "ru": {
-        name: "Русский",
-        data: require("./built-temp/base-ru.json"),
-        code: "ru",
-        region: "",
-    },
-    "cs": {
-        name: "Čeština",
-        data: require("./built-temp/base-cz.json"),
-        code: "cs",
-        region: "",
-    },
-    "es-419": {
-        name: "Español",
-        data: require("./built-temp/base-es.json"),
-        code: "es",
-        region: "",
-    },
-    "pl": {
-        name: "Polski",
-        data: require("./built-temp/base-pl.json"),
-        code: "pl",
-        region: "",
-    },
-    "kor": {
-        name: "한국어",
-        data: require("./built-temp/base-kor.json"),
-        code: "kor",
-        region: "",
-    },
-    "nl": {
-        name: "Nederlands",
-        data: require("./built-temp/base-nl.json"),
-        code: "nl",
-        region: "",
-    },
-    "no": {
-        name: "Norsk",
-        data: require("./built-temp/base-no.json"),
-        code: "no",
-        region: "",
-    },
-
-    "tr": {
-        name: "Türkçe",
-        data: require("./built-temp/base-tr.json"),
-        code: "tr",
-        region: "",
-    },
-
-    "zh-CN": {
-        // simplified
-        name: "中文简体",
-        data: require("./built-temp/base-zh-CN.json"),
-        code: "zh",
-        region: "CN",
-    },
-
-    "zh-TW": {
-        // traditional
-        name: "中文繁體",
-        data: require("./built-temp/base-zh-TW.json"),
-        code: "zh",
-        region: "TW",
-    },
-
-    "sv": {
-        name: "Svenska",
-        data: require("./built-temp/base-sv.json"),
-        code: "sv",
-        region: "",
-    },
-};
+/**
+ * @type {Object<string, {name: string, data: any, code: string, region: string}>}
+ */
+export const LANGUAGES = {
+    "en": {
+        name: "English",
+        data: null,
+        code: "en",
+        region: "",
+    },
+    "de": {
+        name: "Deutsch",
+        data: require("./built-temp/base-de.json"),
+        code: "de",
+        region: "",
+    },
+    "fr": {
+        name: "Français",
+        data: require("./built-temp/base-fr.json"),
+        code: "fr",
+        region: "",
+    },
+    "ja": {
+        name: "日本語",
+        data: require("./built-temp/base-ja.json"),
+        code: "ja",
+        region: "",
+    },
+    "pt-PT": {
+        name: "Português (Portugal)",
+        data: require("./built-temp/base-pt-PT.json"),
+        code: "pt",
+        region: "PT",
+    },
+    "pt-BR": {
+        name: "Português (Brasil)",
+        data: require("./built-temp/base-pt-BR.json"),
+        code: "pt",
+        region: "BR",
+    },
+    "ru": {
+        name: "Русский",
+        data: require("./built-temp/base-ru.json"),
+        code: "ru",
+        region: "",
+    },
+    "cs": {
+        name: "Čeština",
+        data: require("./built-temp/base-cz.json"),
+        code: "cs",
+        region: "",
+    },
+    "es-419": {
+        name: "Español",
+        data: require("./built-temp/base-es.json"),
+        code: "es",
+        region: "",
+    },
+    "pl": {
+        name: "Polski",
+        data: require("./built-temp/base-pl.json"),
+        code: "pl",
+        region: "",
+    },
+    "kor": {
+        name: "한국어",
+        data: require("./built-temp/base-kor.json"),
+        code: "kor",
+        region: "",
+    },
+    "nl": {
+        name: "Nederlands",
+        data: require("./built-temp/base-nl.json"),
+        code: "nl",
+        region: "",
+    },
+    "no": {
+        name: "Norsk",
+        data: require("./built-temp/base-no.json"),
+        code: "no",
+        region: "",
+    },
+
+    "tr": {
+        name: "Türkçe",
+        data: require("./built-temp/base-tr.json"),
+        code: "tr",
+        region: "",
+    },
+
+    "zh-CN": {
+        // simplified
+        name: "中文简体",
+        data: require("./built-temp/base-zh-CN.json"),
+        code: "zh",
+        region: "CN",
+    },
+
+    "zh-TW": {
+        // traditional
+        name: "中文繁體",
+        data: require("./built-temp/base-zh-TW.json"),
+        code: "zh",
+        region: "TW",
+    },
+
+    "sv": {
+        name: "Svenska",
+        data: require("./built-temp/base-sv.json"),
+        code: "sv",
+        region: "",
+    },
+
+    "da": {
+        name: "Dansk",
+        data: require("./built-temp/base-da.json"),
+        code: "da",
+        region: "",
+    },
+};
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index a3f06ca0..fa177874 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -320,20 +320,23 @@ export class MainMenuState extends GameState {
         });
 
         optionSelected.add(value => {
-            this.app.settings.updateLanguage(value);
-            if (setting.restartRequired) {
-                if (this.app.platformWrapper.getSupportsRestart()) {
-                    this.app.platformWrapper.performRestart();
-                } else {
-                    this.dialogs.showInfo(T.dialogs.restartRequired.title, T.dialogs.restartRequired.text, [
-                        "ok:good",
-                    ]);
+            this.app.settings.updateLanguage(value).then(() => {
+                if (setting.restartRequired) {
+                    if (this.app.platformWrapper.getSupportsRestart()) {
+                        this.app.platformWrapper.performRestart();
+                    } else {
+                        this.dialogs.showInfo(
+                            T.dialogs.restartRequired.title,
+                            T.dialogs.restartRequired.text,
+                            ["ok:good"]
+                        );
+                    }
                 }
-            }
 
-            if (setting.changeCb) {
-                setting.changeCb(this.app, value);
-            }
+                if (setting.changeCb) {
+                    setting.changeCb(this.app, value);
+                }
+            });
 
             // Update current icon
             this.htmlElement.querySelector("button.languageChoose").setAttribute("data-languageIcon", value);
diff --git a/translations/base-cz.yaml b/translations/base-cz.yaml
index 4ff7bd2b..f94fa0c7 100644
--- a/translations/base-cz.yaml
+++ b/translations/base-cz.yaml
@@ -3,8 +3,7 @@ steamPage:
         kombinování čím dál složitějších tvarů na nekonečné mapě.
     discordLinkShort: Oficiální Discord
     intro: >-
-        Shapez.io je relaxační hra, ve které musíte stavět továrny pro
-         automatizaci výroby geometrických tvarů.
+        Shapez.io je relaxační hra, ve které musíte stavět továrny pro automatizaci výroby geometrických tvarů.
 
         Jak se zvyšuje úroveň, tvary se stávají stále složitějšími a vy se musíte rozšířit po nekonečné mapě.