AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update incorrect demand message and refactor translation for 'an unknown civilization' (#13606)

Browse Source 
* fix broken translation

* apply suggested change

* fix untraslated string in load game screen

* update incorrect demand message

* refactor translation for an unknown civilization

* fix spaces
This commit is contained in:
metablaster 2025-07-15 10:51:29 +02:00 committed by GitHub
parent dbc5d95aad
commit cfcfb69e72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/assets/jsons/translations/template.properties
View File

@ -143,7 +143,6 @@ Research Agreement =
Declare war = Declare war =
Declare war on [civName]? = Declare war on [civName]? =
[civName] will also join them in the war = [civName] will also join them in the war =
An unknown civilization will also join them in the war =
This will cancel your defensive pact with [civName] = This will cancel your defensive pact with [civName] =
Go to on map = Go to on map =
Let's begin! = Let's begin! =
@ -983,10 +982,8 @@ Cannot provide unit upkeep for [unitName] - unit has been disbanded! =
[construction] has been built in [cityName] = [construction] has been built in [cityName] =
[wonder] has been built in a faraway land = [wonder] has been built in a faraway land =
[civName] has completed [construction]! = [civName] has completed [construction]! =
An unknown civilization has completed [construction]! =
The city of [cityname] has started constructing [construction]! = The city of [cityname] has started constructing [construction]! =
[civilization] has started constructing [construction]! = [civilization] has started constructing [construction]! =
An unknown civilization has started constructing [construction]! =
[cityName] has started working on [construction] = [cityName] has started working on [construction] =
[cityName] has expanded its borders! = [cityName] has expanded its borders! =
Your Golden Age has ended. = Your Golden Age has ended. =
@ -1044,7 +1041,6 @@ Your city [cityName] can bombard the enemy! =
[amount] enemy units were spotted in our territory = [amount] enemy units were spotted in our territory =
A(n) [nukeType] from [civName] has exploded in our territory! = A(n) [nukeType] from [civName] has exploded in our territory! =
A(n) [nukeType] has been detonated by [civName]! = A(n) [nukeType] has been detonated by [civName]! =
A(n) [nukeType] has been detonated by an unknown civilization! =
After an attempted attack by our [nukeType], [civName] has declared war on us! = After an attempted attack by our [nukeType], [civName] has declared war on us! =
After being hit by our [nukeType], [civName] has declared war on us! = After being hit by our [nukeType], [civName] has declared war on us! =
The civilization of [civName] has been destroyed! = The civilization of [civName] has been destroyed! =
@ -1112,7 +1108,6 @@ We Love The King Day in [cityName] has ended. =
Our [name] took [tileDamage] tile damage and was destroyed = Our [name] took [tileDamage] tile damage and was destroyed =
Our [name] took [tileDamage] tile damage = Our [name] took [tileDamage] tile damage =
[civName] has adopted the [policyName] policy = [civName] has adopted the [policyName] policy =
An unknown civilization has adopted the [policyName] policy =
You gained [Stats] as your religion was spread to [cityName] = You gained [Stats] as your religion was spread to [cityName] =
You gained [Stats] as your religion was spread to an unknown city = You gained [Stats] as your religion was spread to an unknown city =
Your city [cityName] was converted to [religionName]! = Your city [cityName] was converted to [religionName]! =
@ -1123,8 +1118,6 @@ You have unlocked [ability]! =
A new b'ak'tun has just begun! = A new b'ak'tun has just begun! =
A Great Person joins you! = A Great Person joins you! =
[civ1] has liberated [civ2] = [civ1] has liberated [civ2] =
[civ] has liberated an unknown civilization =
An unknown civilization has liberated [civ] =
# Trigger notifications # Trigger notifications
@ -1842,7 +1835,7 @@ Spy Hideout =
Spy present = Spy present =
Move = Move =
After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = After [unknownCiv] entered the [eraName], we have recruited [spyName] as a spy! =
We have recruited [spyName] as a spy! = We have recruited [spyName] as a spy! =
We have recruited a new spy name [spyName] after [oldSpyName] was killed. = We have recruited a new spy name [spyName] after [oldSpyName] was killed. =
Your spy [spyName] has leveled up! = Your spy [spyName] has leveled up! =

2
core/src/com/unciv/logic/battle/Nuke.kt
View File

@ -141,7 +141,7 @@ object Nuke {
) )
else else
otherCiv.addNotification( otherCiv.addNotification(
"A(n) [${attacker.getName()}] has been detonated by an unknown civilization!", "A(n) [${attacker.getName()}] has been detonated by an [unknown civilization]!",
nukeNotificationAction, NotificationCategory.War, NotificationIcon.War, attacker.getName() nukeNotificationAction, NotificationCategory.War, NotificationIcon.War, attacker.getName()
) )
} }

4
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -459,7 +459,7 @@ class CityConstructions : IsPartOfGameInfoSerialization {
otherCiv.knows(city.civ) -> otherCiv.knows(city.civ) ->
otherCiv.addNotification("[${city.civ.civName}] has started constructing [${construction.name}]!", otherCiv.addNotification("[${city.civ.civName}] has started constructing [${construction.name}]!",
NotificationCategory.General, NotificationIcon.Construction, icon) NotificationCategory.General, NotificationIcon.Construction, icon)
else -> otherCiv.addNotification("An unknown civilization has started constructing [${construction.name}]!", else -> otherCiv.addNotification("[An unknown civilization] has started constructing [${construction.name}]!",
NotificationCategory.General, NotificationIcon.Construction, icon) NotificationCategory.General, NotificationIcon.Construction, icon)
} }
} }
@ -545,7 +545,7 @@ class CityConstructions : IsPartOfGameInfoSerialization {
// No need to notify ourself, since we already got the building notification anyway // No need to notify ourself, since we already got the building notification anyway
if (otherCiv == city.civ) continue if (otherCiv == city.civ) continue
val completingCivDescription = val completingCivDescription =
if (otherCiv.knows(city.civ)) "[${city.civ.civName}]" else "An unknown civilization" if (otherCiv.knows(city.civ)) "[${city.civ.civName}]" else "[An unknown civilization]"
otherCiv.addNotification("$completingCivDescription has completed [${construction.name}]!", otherCiv.addNotification("$completingCivDescription has completed [${construction.name}]!",
pediaAction, NotificationCategory.General, NotificationIcon.Construction, buildingIcon) pediaAction, NotificationCategory.General, NotificationIcon.Construction, buildingIcon)
} }

4
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -208,9 +208,9 @@ class CityConquestFunctions(val city: City) {
civ.knows(conqueringCiv) && civ.knows(foundingCiv) -> civ.knows(conqueringCiv) && civ.knows(foundingCiv) ->
civ.addNotification("[$conqueringCiv] has liberated [$foundingCiv]", NotificationCategory.Diplomacy, foundingCiv.civName, NotificationIcon.Diplomacy, conqueringCiv.civName) civ.addNotification("[$conqueringCiv] has liberated [$foundingCiv]", NotificationCategory.Diplomacy, foundingCiv.civName, NotificationIcon.Diplomacy, conqueringCiv.civName)
civ.knows(conqueringCiv) && !civ.knows(foundingCiv) -> civ.knows(conqueringCiv) && !civ.knows(foundingCiv) ->
civ.addNotification("[$conqueringCiv] has liberated an unknown civilization", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, conqueringCiv.civName) civ.addNotification("[$conqueringCiv] has liberated [an unknown civilization]", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, conqueringCiv.civName)
!civ.knows(conqueringCiv) && civ.knows(foundingCiv) -> !civ.knows(conqueringCiv) && civ.knows(foundingCiv) ->
civ.addNotification("An unknown civilization has liberated [$foundingCiv]", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, foundingCiv.civName) civ.addNotification("[An unknown civilization] has liberated [$foundingCiv]", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, foundingCiv.civName)
else -> continue else -> continue
} }
} }

2
core/src/com/unciv/logic/civilization/diplomacy/Demand.kt
View File

@ -61,7 +61,7 @@ enum class Demand(
refuseDemandText = "We shall do as we please.", refuseDemandText = "We shall do as we please.",
agreedToDemandText = "[civName] agreed to stop spreading religion to us!", agreedToDemandText = "[civName] agreed to stop spreading religion to us!",
refusedDemandText = "[civName] refused to stop spreading religion to us!", refusedDemandText = "[civName] refused to stop spreading religion to us!",
violationNoticedText = "We noticed you have continued spreading your faith, despite your promise. This will have....consequences.", violationNoticedText = "We noticed you have continued spreading your religion to us, despite your promise. This will have....consequences.",
wePromisedText = "We promised not to spread religion to them ([turns] turns remaining)", wePromisedText = "We promised not to spread religion to them ([turns] turns remaining)",
theyPromisedText = "They promised not to spread religion to us ([turns] turns remaining)", theyPromisedText = "They promised not to spread religion to us ([turns] turns remaining)",
), ),

2
core/src/com/unciv/logic/civilization/managers/PolicyManager.kt
View File

@ -306,7 +306,7 @@ class PolicyManager : IsPartOfGameInfoSerialization {
val defaultNotificationText = if (civ.getKnownCivs().contains(civInfo)) { val defaultNotificationText = if (civ.getKnownCivs().contains(civInfo)) {
"[${civInfo.civName}] has adopted the [${policy.name}] policy" "[${civInfo.civName}] has adopted the [${policy.name}] policy"
} else { } else {
"An unknown civilization has adopted the [${policy.name}] policy" "[An unknown civilization] has adopted the [${policy.name}] policy"
} }
civ.addNotification( civ.addNotification(
"{${defaultNotificationText}} {${extraNotificationText}}", "{${defaultNotificationText}} {${extraNotificationText}}",

2
core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
View File

@ -884,7 +884,7 @@ object UniqueTriggerActivation {
// We don't tell which civilization entered the new era, as that is done in the notification directly above this one // We don't tell which civilization entered the new era, as that is done in the notification directly above this one
spy.addNotification("We have recruited [${spy.name}] as a spy!") spy.addNotification("We have recruited [${spy.name}] as a spy!")
else else
spy.addNotification("After an unknown civilization entered the [$currentEra], we have recruited [${spy.name}] as a spy!") spy.addNotification("After [an unknown civilization] entered the [$currentEra], we have recruited [${spy.name}] as a spy!")
} }
} }
true true

2
core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
View File

@ -339,7 +339,7 @@ class DiplomacyScreen(
messageLines += if (viewingCiv.knows(civ)) { messageLines += if (viewingCiv.knows(civ)) {
"[${civ.civName}] will also join them in the war" "[${civ.civName}] will also join them in the war"
} else { } else {
"An unknown civilization will also join them in the war" "[An unknown civilization] will also join them in the war"
} }
} }