From 777d1391f405b6feca96bb82ac161162d3a24498 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 22 Oct 2019 19:41:22 +0300 Subject: [PATCH] Changed options for "Show worked tiles" and "Show resources and improvements" because it was less clear than the other options --- .../NewGame,SaveGame,LoadGame,Options.json | 2 +- .../optionstable/WorldScreenOptionsTable.kt | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index b45883e0b9..3951491746 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -821,7 +821,7 @@ Czech:"Schovat" } - "Worked tiles":{ + "Show worked tiles":{ Italian:"Celle sfruttate" Russian:"Обрабатываемые клетки" French:"cases exploités" diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index c9dbb6e2c8..8b7f5fa906 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -46,14 +46,18 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr val innerTable = PopupTable(screen) // cheating, to get the old code to fit inside a Scroll =) innerTable.background = null - innerTable.add("Worked tiles".toLabel()) - if (settings.showWorkedTiles) innerTable.addButton("Hide") { settings.showWorkedTiles = false; update() } - else innerTable.addButton("Show") { settings.showWorkedTiles = true; update() } - innerTable.add("Resources and improvements".toLabel()) - if (settings.showResourcesAndImprovements) - innerTable.addButton("Hide") { settings.showResourcesAndImprovements = false; update() } - else innerTable.addButton("Show") { settings.showResourcesAndImprovements = true; update() } + innerTable.add("Show worked tiles".toLabel()) + innerTable.addButton(if (settings.showWorkedTiles) "Yes".tr() else "No".tr()) { + settings.showWorkedTiles= !settings.showWorkedTiles + update() + } + + innerTable.add("Show resources and improvements".toLabel()) + innerTable.addButton(if (settings.showResourcesAndImprovements) "Yes".tr() else "No".tr()) { + settings.showResourcesAndImprovements = !settings.showResourcesAndImprovements + update() + } innerTable.add("Check for idle units".toLabel()) innerTable.addButton(if (settings.checkForDueUnits) "Yes".tr() else "No".tr()) {