(c91620d64) Fixed all language options showing "English" if the name of the language is not present in the text files, apply settings when switching language (too easy to just change the language and restart without applying first)

2019-05-06 14:13:22 +03:00
parent 47d7bd8f14
commit 3c1db2e9a7
5 changed files with 123 additions and 239 deletions
@@ -132,7 +132,7 @@ namespace Barotrauma
            var languageDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.045f), generalLayoutGroup.RectTransform));
            foreach (string language in TextManager.AvailableLanguages)
            {
-                languageDD.AddItem(TextManager.Get("Language." + language, returnNull: true) ?? Language, language);
+                languageDD.AddItem(TextManager.Get("Language." + language, returnNull: true) ?? language, language);
            }
            languageDD.SelectItem(TextManager.Language);
            languageDD.OnSelected = (guiComponent, obj) =>
@@ -142,6 +142,7 @@ namespace Barotrauma

                UnsavedSettings = true;
                Language = newLanguage;
+                ApplySettings();

                new GUIMessageBox(TextManager.Get("RestartRequiredLabel"), TextManager.Get("RestartRequiredLanguage"));