diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index f89f371616..dc8e6d5e06 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -134,6 +134,8 @@ Dutch:"Opstellen" } + "Upgrade to [unitType] ([goldCost] gold)":{} // EG Upgrade to Cannon (140 gold) + "Found city":{ Italian:"Crea città" Russian:"Создать город" diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt index fb470c7c90..b71adc4e45 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt @@ -30,8 +30,8 @@ class YesNoPopupTable(question:String, action:()->Unit, val skin = CameraStageBaseScreen.skin add(Label(question,skin)).colspan(2).row() - add(TextButton("No",skin).apply { addClickListener { this@YesNoPopupTable.remove() } }) - add(TextButton("Yes",skin).apply { addClickListener { this@YesNoPopupTable.remove(); action() } }) + add(TextButton("No".tr(),skin).apply { addClickListener { this@YesNoPopupTable.remove() } }) + add(TextButton("Yes".tr(),skin).apply { addClickListener { this@YesNoPopupTable.remove(); action() } }) pack() center(screen.stage) screen.stage.addActor(this) diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 1a97e2c6b3..663d7c294b 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -9,6 +9,7 @@ import com.unciv.models.gamebasics.unit.UnitType import com.unciv.ui.pickerscreens.ImprovementPickerScreen import com.unciv.ui.pickerscreens.PromotionPickerScreen import com.unciv.ui.pickerscreens.TechPickerScreen +import com.unciv.ui.utils.tr import com.unciv.ui.worldscreen.WorldScreen import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable import java.util.* @@ -61,7 +62,7 @@ class UnitActions { val upgradedUnit = GameBasics.Units[unit.getBaseUnit().upgradesTo!!]!! if (upgradedUnit.isBuildable(unit.civInfo)) { val goldCostOfUpgrade = (upgradedUnit.cost - unit.getBaseUnit().cost) * 2 + 10 - actionList += UnitAction("Upgrade to ${upgradedUnit.name} ($goldCostOfUpgrade gold)", + actionList += UnitAction("Upgrade to [${upgradedUnit.name}] ([$goldCostOfUpgrade] gold)", { unit.civInfo.gold -= goldCostOfUpgrade val unitTile = unit.getTile() @@ -166,7 +167,7 @@ class UnitActions { actionList += UnitAction("Disband unit", { - YesNoPopupTable("Do you really want to disband this unit?", + YesNoPopupTable("Do you really want to disband this unit?".tr(), {unit.removeFromTile(); worldScreen.update()} ) },unit.currentMovement != 0f) diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index e0b5e021b4..d7ac759ea6 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -14,7 +14,7 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ fun getIconForUnitAction(unitAction:String): Image { if(unitAction.startsWith("Upgrade to")){ - val unitToUpgradeTo = Regex("""Upgrade to (\S*)""").find(unitAction)!!.groups[1]!!.value + val unitToUpgradeTo = Regex("""Upgrade to \[(\S*)\]""").find(unitAction)!!.groups[1]!!.value return ImageGetter.getUnitIcon(unitToUpgradeTo) } when(unitAction){