From 3816014ae41497444cc579acf5b45ea9e75604e4 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 28 Nov 2019 21:10:36 +0200
Subject: [PATCH] Added Great Person city location to notification

---
 .../jsons/Translations/Notifications.json     | 27 +++++++++----------
 .../logic/civilization/CivilizationInfo.kt    |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index 5de79fd325..b5343e6a48 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -56,20 +56,19 @@
 		Polish:"[resourceName] odkryte nieopodal [cityName]"
 	}
 
-	"A [greatPerson] has been born!":{	//Smashfanful sayd: "You should add WHERE the Great Person is born, so it should be "A [greatPerson] is born in [cityName]""
-		Italian:"È nato un [greatPerson]!"
-		Russian:"[greatPerson] родился!"
-		French:"Un [greatPerson] est né!"
-		Romanian:"S-a născut un [greatPerson]!"
-		Spanish:"¡Un [greatPerson] ha nacido!"
-		Simplified_Chinese:"一个[greatPerson]已经出现！"
-		Traditional_Chinese:"一個[greatPerson]已經出現!"
-		Portuguese:"Um [greatPerson] nasceu!"
-		German:"Ein [greatPerson] wurde geboren!"
-		Japanese:"[greatPerson]が誕生しました！",
-		Czech:"Narodil se [greatPerson]"
-		Ukrainian:"Народився [greatPerson]!"
-		Polish:"[greatPerson] urodził/a się!"
+	"A [greatPerson] has been born in [cityName]!":{
+		Italian:"[cityName] - È nato un [greatPerson]!",
+		Russian:"[cityName] - [greatPerson] родился!",
+		French:"[cityName] - Un [greatPerson] est né!",
+		Romanian:"[cityName] - S-a născut un [greatPerson]!",
+		Spanish:"¡[cityName] - Un [greatPerson] ha nacido!",
+		Simplified_Chinese:"[cityName] - 一个[greatPerson]已经出现！",
+		Traditional_Chinese:"[cityName] - 一個[greatPerson]已經出現!",
+		Portuguese:"[cityName] - Um [greatPerson] nasceu!",
+		German:"[cityName] - Ein [greatPerson] wurde geboren!",
+		Czech:"[cityName] - Narodil se [greatPerson]",
+		Ukrainian:"[cityName] - Народився [greatPerson]!",
+		Polish:"[cityName] - [greatPerson] urodził/a się!"
 	}
 
 	"We have encountered [civName]!":{
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 60ccda0b32..066f0f2b43 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -435,7 +435,7 @@ class CivilizationInfo {
 
     fun addGreatPerson(greatPerson: String, city:CityInfo) {
         placeUnitNearTile(city.location, greatPerson)
-        addNotification("A [$greatPerson] has been born!", city.location, Color.GOLD)
+        addNotification("A [$greatPerson] has been born in [${city.name}]!", city.location, Color.GOLD)
     }
 
     fun placeUnitNearTile(location: Vector2, unitName: String): MapUnit? {