From e78f408bff5d276fe35ea23ec25da2798416863e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 11 Jul 2019 21:21:45 +0300 Subject: [PATCH] Translation fixes --- android/assets/jsons/Translations/Other.json | 2 +- core/src/com/unciv/logic/city/CityStats.kt | 2 +- .../unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 522f262c9f..97acdf07c3 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1584,7 +1584,7 @@ German:"Bevölkerung" } - "CityStates":{ + "City States":{ Italian:"Città-Stato" } diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 4731ea9794..1241bfaf8c 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -342,7 +342,7 @@ class CityStats { newBaseStatList["Buildings"] = cityInfo.cityConstructions.getStats() newBaseStatList["Policies"] = getStatsFromPolicies(civInfo.policies.adoptedPolicies) newBaseStatList["National ability"] = getStatsFromNationUnique() - newBaseStatList["CityStates"] = getStatsFromCityStates() + newBaseStatList["City States"] = getStatsFromCityStates() baseStatList = newBaseStatList } diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 67f7ae2487..6c7b67a68f 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -191,8 +191,8 @@ class DiplomacyManager() { trades.remove(trade) val otherCivTrades = otherCiv().getDiplomacyManager(civInfo).trades otherCivTrades.removeAll{ it.equals(trade.reverse()) } - civInfo.addNotification("One of our trades with [$otherCivName] has been cut short!".tr(),null, Color.GOLD) - otherCiv().addNotification("One of our trades with [${civInfo.civName}] has been cut short!".tr(),null, Color.GOLD) + civInfo.addNotification("One of our trades with [$otherCivName] has been cut short".tr(),null, Color.GOLD) + otherCiv().addNotification("One of our trades with [${civInfo.civName}] has been cut short".tr(),null, Color.GOLD) } } }