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

Fix missing translatables, again (#6705)

Browse Source
This commit is contained in:
SomeTroglodyte
2022-05-10 23:21:38 +02:00
committed by GitHub
parent 7841f57fc8
commit 7b4833741d
9 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,6 +658,7 @@ No problems found. =
Autoupdate mod uniques =
Uniques updated! =
Max zoom out =
Show experimental world wrap for maps =
HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! =
Enable portrait orientation =
@ -785,7 +786,6 @@ Our [name] took [tileDamage] tile damage and was destroyed =
Our [name] took [tileDamage] tile damage =
[civName] has adopted the [policyName] policy =
An unknown civilization has adopted the [policyName] policy =
Our influence with City-States has started dropping faster! =
You gained [Stats] as your religion was spread to [cityName] =
You gained [Stats] as your religion was spread to an unknown city =
Your city [cityName] was converted to [religionName]! =

11
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -12,6 +12,7 @@ import com.unciv.models.translations.fillPlaceholders
import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.getConsumesAmountString
import com.unciv.ui.utils.toPercent
import kotlin.math.pow
@ -109,13 +110,13 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
if (isWonder) lines += "Wonder"
if (isNationalWonder) lines += "National Wonder"
if (!isFree) {
val availableResources = if(!showAdditionalInfo) emptyMap()
val availableResources = if (!showAdditionalInfo) emptyMap()
else cityInfo.civInfo.getCivResources().associate { it.resource.name to it.amount }
for ((resource, amount) in getResourceRequirements()) {
val available = availableResources[resource] ?: 0
lines += if (showAdditionalInfo)
"{Consumes [$amount] [$resource]} ({[$available] available})"
else "Consumes [$amount] [$resource]"
"{${resource.getConsumesAmountString(amount)}} ({[$available] available})"
else resource.getConsumesAmountString(amount)
}
}
@ -244,7 +245,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
for ((resource, amount) in resourceRequirements) {
textList += FormattedLine(
// the 1 variant should deprecate some time
if (amount == 1) "Consumes 1 [$resource]" else "Consumes [$amount] [$resource]",
resource.getConsumesAmountString(amount),
link="Resources/$resource", color="#F42" )
}
}
@ -650,7 +651,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
for ((resource, amount) in getResourceRequirements())
if (civInfo.getCivResourcesByName()[resource]!! < amount) {
rejectionReasons.add(RejectionReason.ConsumesResources.toInstance("Consumes [$amount] [$resource]" ))
rejectionReasons.add(RejectionReason.ConsumesResources.toInstance(resource.getConsumesAmountString(amount)))
}
if (requiredNearbyImprovedResources != null) {

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

@ -504,6 +504,8 @@ enum class UniqueParameterType(
override fun getTranslationWriterStringsForOutput() = scanExistingValues(this)
},
/** We don't know anything about this parameter - this needs to return
* [isTranslationWriterGuess]() == `true` for all inputs or TranslationFileWriter will have a problem! */
Unknown("param", "Unknown") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):
UniqueType.UniqueComplianceErrorSeverity? = null

7
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -14,6 +14,7 @@ import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.filterAndLogic
import com.unciv.ui.utils.getConsumesAmountString
import com.unciv.ui.utils.toPercent
import kotlin.collections.ArrayList
import kotlin.collections.HashMap
@ -78,7 +79,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
val availableResources = cityInfo.civInfo.getCivResources().associate { it.resource.name to it.amount }
for ((resource, amount) in getResourceRequirements()) {
val available = availableResources[resource] ?: 0
lines += "Consumes ${if (amount == 1) "1" else "[$amount]"} [$resource] ({[$available] available})".tr()
lines += "{${resource.getConsumesAmountString(amount)}} ({[$available] available})".tr()
}
var strengthLine = ""
if (strength != 0) {
@ -147,7 +148,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
textList += FormattedLine()
for ((resource, amount) in resourceRequirements) {
textList += FormattedLine(
if (amount == 1) "Consumes 1 [$resource]" else "Consumes [$amount] [$resource]",
resource.getConsumesAmountString(amount),
link = "Resource/$resource", color = "#F42"
)
}
@ -441,7 +442,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
if (!civInfo.isBarbarian()) { // Barbarians don't need resources
for ((resource, amount) in getResourceRequirements())
if (civInfo.getCivResourcesByName()[resource]!! < amount) {
rejectionReasons.add(RejectionReason.ConsumesResources.toInstance("Consumes [$amount] [$resource]"))
rejectionReasons.add(RejectionReason.ConsumesResources.toInstance(resource.getConsumesAmountString(amount)))
}
}

2
core/src/com/unciv/models/translations/TranslationFileWriter.kt
View File

@ -344,6 +344,8 @@ object TranslationFileWriter {
UniqueParameterType.guessTypeForTranslationWriter(parameter, ruleset).parameterName
}
parameterNames.addNumberedParameter(parameterName)
if (parameterName == UniqueParameterType.Unknown.parameterName)
resultStrings.add("$parameter = ") // Unknown parameter contents better be offered to translators too
}
resultStrings.add("${stringToTranslate.fillPlaceholders(*parameterNames.toTypedArray())} = ")
}

8
core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt
View File

@ -174,10 +174,7 @@ class CityConstructionsTable(private val cityScreen: CityScreen) {
val useStoredProduction = entry is Building || !cityConstructions.isBeingConstructedOrEnqueued(entry.name)
var buttonText = entry.name.tr() + cityConstructions.getTurnsToConstructionString(entry.name, useStoredProduction)
for ((resource, amount) in entry.getResourceRequirements()) {
buttonText += "\n" + (
if (amount == 1) "Consumes 1 [$resource]"
else "Consumes [$amount] [$resource]"
).tr()
buttonText += "\n" + resource.getConsumesAmountString(amount).tr()
}
constructionButtonDTOList.add(
@ -278,8 +275,7 @@ class CityConstructionsTable(private val cityScreen: CityScreen) {
val constructionResource = cityConstructions.getConstruction(constructionName).getResourceRequirements()
for ((resource, amount) in constructionResource)
text += if (amount == 1) "\n" + "Consumes 1 [$resource]".tr()
else "\n" + "Consumes [$amount] [$resource]".tr()
text += "\n" + resource.getConsumesAmountString(amount).tr()
table.defaults().pad(2f).minWidth(40f)
if (isFirstConstructionOfItsKind) table.add(getProgressBar(constructionName)).minWidth(5f)

2
core/src/com/unciv/ui/overviewscreen/ReligionOverviewTable.kt
View File

@ -152,7 +152,7 @@ class ReligionOverviewTab(
val manager = religion.getFounder().religionManager
statsTable.add("Cities following this religion:".toLabel())
statsTable.add(manager.numberOfCitiesFollowingThisReligion().toLabel()).right().row()
statsTable.add("{Followers of this religion}:".toLabel())
statsTable.add("Followers of this religion:".toLabel())
statsTable.add(manager.numberOfFollowersFollowingThisReligion("in all cities").toLabel()).right().row()
val minWidth = max(statsTable.minWidth, beliefsTable.minWidth) + 5

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

@ -932,7 +932,7 @@ class DiplomacyScreen(
}
private fun getGoToOnMapButton(civilization: CivilizationInfo): TextButton {
val goToOnMapButton = TextButton("Go to on map", skin)
val goToOnMapButton = "Go to on map".toTextButton()
goToOnMapButton.onClick {
UncivGame.Current.setWorldScreen()
UncivGame.Current.worldScreen.mapHolder.setCenterPosition(civilization.getCapital().location, selectUnit = false)

8
core/src/com/unciv/ui/utils/ExtensionFunctions.kt
View File

@ -370,3 +370,11 @@ fun <T> String.filterCompositeLogic(predicate: (String) -> T?, operation: (T, T)
* otherwise return `null` for Elvis chaining of the individual filter. */
fun String.filterAndLogic(predicate: (String) -> Boolean): Boolean? =
if (contains('{')) filterCompositeLogic(predicate) { a, b -> a && b } else null
/** Convert a [resource name][this] into "Consumes [amount] $resource" string (untranslated, using separate templates for 1 and other amounts) */
//todo some day... remove and use just one translatable where this is called
fun String.getConsumesAmountString(amount: Int) = (
if (amount == 1) "Consumes 1 [$this]"
else "Consumes [$amount] [$this]"
)