From 995ebb5cf83e8c31e6eaa06b1d4c4a25b90ccb62 Mon Sep 17 00:00:00 2001 From: etourdot Date: Sun, 12 May 2019 23:25:00 +0200 Subject: [PATCH] #742: fix options screen bug when language changed --- .../worldscreen/optionstable/WorldScreenOptionsTable.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index a6d0724d5e..84913b5b48 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -28,7 +28,7 @@ class Language(val language:String){ } class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ - val languageSelectBox = SelectBox(skin) + var selectedLanguage: String = "English" init { update() @@ -157,7 +157,7 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ private fun addLanguageSelectBox() { add("Language".toLabel()) - + val languageSelectBox = SelectBox(skin) val languageArray = Array() GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete } .forEach { languageArray.add(it) } @@ -167,7 +167,7 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ languageSelectBox.addListener(object : ChangeListener() { override fun changed(event: ChangeEvent?, actor: Actor?) { - val selectedLanguage = languageSelectBox.selected.language + selectedLanguage = languageSelectBox.selected.language if (Fonts().containsFont(Fonts().getFontForLanguage(selectedLanguage))) selectLanguage() else { @@ -206,7 +206,7 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ fun selectLanguage(){ - UnCivGame.Current.settings.language = languageSelectBox.selected.language + UnCivGame.Current.settings.language = selectedLanguage UnCivGame.Current.settings.save() CameraStageBaseScreen.resetFonts()