mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-04 09:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved untranslated texts as per #6131

Browse Source 
- "Resources" in city-state diplomacy screen
- "When Friends"/"When Allies" in same
- "Enhance religion"
- "Choose a Religion" in religion screen
- Religion name in religion screen
- Translated drilldown items in city screen
- "null for wheat" in improvement Civilopedia entry
- "Type" and others in city-state civilopedia entry
This commit is contained in:
Yair Morgenstern
2022-02-13 10:58:47 +02:00
parent 0d3a0ef7e3
commit 4b2bde0365
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1177,6 +1177,7 @@ Choose any belief! =
Found [religionName] =
Enhance [religionName] =
Choose a pantheon =
Choose a Religion =
Found Religion =
Found Pantheon =
Follow [belief] =

6
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -148,7 +148,7 @@ class Nation : RulesetObject() {
private fun getCityStateInfo(ruleset: Ruleset): List<FormattedLine> {
val textList = ArrayList<FormattedLine>()
textList += FormattedLine("Type: [$cityStateType]", header = 4, color = cityStateType!!.color)
textList += FormattedLine("{Type}: [$cityStateType]", header = 4, color = cityStateType!!.color)
val era = if (UncivGame.isCurrentInitialized() && UncivGame.Current.isGameInfoInitialized())
UncivGame.Current.gameInfo.currentPlayerCiv.getEra()
@ -159,7 +159,7 @@ class Nation : RulesetObject() {
val friendBonus = era.friendBonus[cityStateType!!.name]
if (friendBonus != null && friendBonus.isNotEmpty()) {
textList += FormattedLine()
textList += FormattedLine("When Friends: ")
textList += FormattedLine("{When Friends}: ")
friendBonus.forEach {
textList += FormattedLine(Unique(it), indent = 1)
if (it == "Provides a unique luxury") showResources = true
@ -169,7 +169,7 @@ class Nation : RulesetObject() {
val allyBonus = era.allyBonus[cityStateType!!.name]
if (allyBonus != null && allyBonus.isNotEmpty()) {
textList += FormattedLine()
textList += FormattedLine("When Allies: ")
textList += FormattedLine("{When Allies}: ")
allyBonus.forEach {
textList += FormattedLine(Unique(it), indent = 1)
if (it == "Provides a unique luxury") showResources = true

1
core/src/com/unciv/models/ruleset/tile/TileImprovement.kt
View File

@ -120,6 +120,7 @@ class TileImprovement : RulesetStatsObject() {
var addedLineBeforeResourceBonus = false
for (resource in ruleset.tileResources.values.filter { it.improvement == name }) {
if (resource.improvementStats == null) continue
if (!addedLineBeforeResourceBonus) {
addedLineBeforeResourceBonus = true
textList += FormattedLine()

2
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -151,7 +151,7 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(BaseScreen.skin)
for ((name, child) in statTreeNode.children) {
val statAmount = child.totalStats[stat]
if (statAmount == 0f) continue
hashMap["- ".repeat(indentation) + name] = statAmount
hashMap["- ".repeat(indentation) + name.tr()] = statAmount
if (showDetails) addStatsToHashmap(child, hashMap, stat, showDetails, indentation + 1)
}
}

4
core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt
View File

@ -52,7 +52,7 @@ class ReligiousBeliefsPickerScreen (
topTable.addSeparator()
topTable.add(middlePanes)
if (pickIconAndName) rightSideButton.label = "Choose a religion".toLabel()
if (pickIconAndName) rightSideButton.label = "Choose a Religion".toLabel()
else rightSideButton.label = "Enhance [${choosingCiv.religionManager.religion!!.getReligionDisplayName()}]".toLabel()
rightSideButton.onClick(UncivSound.Choir) {
choosingCiv.religionManager.chooseBeliefs(displayName, religionName, chosenBeliefs.map { it!! })
@ -76,7 +76,7 @@ class ReligiousBeliefsPickerScreen (
fun changeDisplayedReligionName(newReligionName: String) {
displayName = newReligionName
rightSideButton.label = "Found [$newReligionName]".toLabel()
descriptionLabel.setText(newReligionName)
descriptionLabel.setText(newReligionName.tr())
}
val changeReligionNameButton = Button(

6
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -145,7 +145,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
if (otherCiv.detailedCivResources.any { it.resource.resourceType != ResourceType.Bonus }) {
val resourcesTable = Table()
resourcesTable.add("{Resources:} ".toLabel()).padRight(10f)
resourcesTable.add("{Resources}: ".toLabel()).padRight(10f)
for (supplyList in otherCiv.detailedCivResources) {
if (supplyList.resource.resourceType == ResourceType.Bonus)
continue
@ -196,12 +196,12 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
val eraInfo = viewingCiv.getEra()
var friendBonusText = "{When Friends:} ".tr()
var friendBonusText = "{When Friends}: ".tr()
val friendBonusObjects = eraInfo.getCityStateBonuses(otherCiv.cityStateType, RelationshipLevel.Friend)
val friendBonusStrings = getAdjustedBonuses(friendBonusObjects)
friendBonusText += friendBonusStrings.joinToString(separator = ", ") { it.tr() }
var allyBonusText = "{When Allies:} ".tr()
var allyBonusText = "{When Allies}: ".tr()
val allyBonusObjects = eraInfo.getCityStateBonuses(otherCiv.cityStateType, RelationshipLevel.Ally)
val allyBonusStrings = getAdjustedBonuses(allyBonusObjects)
allyBonusText += allyBonusStrings.joinToString(separator = ", ") { it.tr() }

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -774,7 +774,7 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Bas
}
viewingCiv.religionManager.religionState == ReligionState.EnhancingReligion ->
NextTurnAction("Enhance Religion", Color.ORANGE) {
NextTurnAction("Enhance a Religion", Color.ORANGE) {
game.setScreen(
ReligiousBeliefsPickerScreen(
viewingCiv,