From 0536c5f24b057165dba225e362fe07205ce2374b Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 26 Jun 2023 22:08:41 +0300
Subject: [PATCH] Resolved #9669 - city name translation for conquered popup
 does not get icon

---
 .../unciv/logic/city/managers/CityInfoConquestFunctions.kt | 7 +++----
 core/src/com/unciv/ui/popups/Popup.kt                      | 4 ++--
 core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt
index 70e189a898..e171adcefb 100644
--- a/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt
@@ -102,11 +102,11 @@ class CityInfoConquestFunctions(val city: City){
             conqueringCiv.addNotification("Received [$goldPlundered] Gold for capturing [$name]",
                 getCenterTile().position, NotificationCategory.General, NotificationIcon.Gold)
 
-            val reconqueredCityWhileStillInResistance = previousOwner == conqueringCiv.civName && isInResistance()
+            val reconqueredCityWhileStillInResistance = previousOwner == receivingCiv.civName && isInResistance()
 
             destroyBuildingsOnCapture()
 
-            this@CityInfoConquestFunctions.moveToCiv(receivingCiv)
+            moveToCiv(receivingCiv)
 
             Battle.destroyIfDefeated(conqueredCiv, conqueringCiv)
 
@@ -326,8 +326,7 @@ class CityInfoConquestFunctions(val city: City){
             cityStats.update()
 
             // Update proximity rankings
-            civ.updateProximity(oldCiv,
-                oldCiv.updateProximity(civ))
+            civ.updateProximity(oldCiv, oldCiv.updateProximity(civ))
 
             // Update history
             city.getTiles().forEach { tile ->
diff --git a/core/src/com/unciv/ui/popups/Popup.kt b/core/src/com/unciv/ui/popups/Popup.kt
index 7e8a4d934c..a90a0d6ee7 100644
--- a/core/src/com/unciv/ui/popups/Popup.kt
+++ b/core/src/com/unciv/ui/popups/Popup.kt
@@ -266,8 +266,8 @@ open class Popup(
      * @param text The caption text.
      * @param size The font size for the label.
      */
-    fun addGoodSizedLabel(text: String, size: Int = Constants.defaultFontSize): Cell<Label> {
-        val label = text.toLabel(fontSize = size)
+    fun addGoodSizedLabel(text: String, size: Int = Constants.defaultFontSize, hideIcons:Boolean = false): Cell<Label> {
+        val label = text.toLabel(fontSize = size, hideIcons = hideIcons)
         label.wrap = true
         label.setAlignment(Align.center)
         return add(label).width(stageToShowOn.width / 2)
diff --git a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
index 9e7dc5fe22..ad3a6e9a7c 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
@@ -381,7 +381,7 @@ class AlertPopup(
 
     private fun addQuestionAboutTheCity(cityName: String) {
         addGoodSizedLabel("What would you like to do with the city of [$cityName]?",
-            Constants.headingFontSize).padBottom(20f).row()
+            Constants.headingFontSize, hideIcons = true).padBottom(20f).row()
     }
 
     private fun addDestroyOption(destroyAction: () -> Unit) {