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

Fix translation problems due to nested brackets in getDifferences (#9600)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-06-16 09:36:24 +02:00 committed by GitHub
parent 670a08c0b9
commit ea505e3e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt
View File

@ -1,10 +1,7 @@
package com.unciv.ui.objectdescriptions package com.unciv.ui.objectdescriptions
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Container
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup
import com.unciv.logic.city.City import com.unciv.logic.city.City
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.Unique
@ -18,8 +15,8 @@ import com.unciv.models.translations.tr
import com.unciv.ui.components.Fonts import com.unciv.ui.components.Fonts
import com.unciv.ui.components.extensions.getConsumesAmountString import com.unciv.ui.components.extensions.getConsumesAmountString
import com.unciv.ui.components.extensions.toPercent import com.unciv.ui.components.extensions.toPercent
import com.unciv.ui.screens.civilopediascreen.FormattedLine
import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.screens.civilopediascreen.FormattedLine
import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.screens.civilopediascreen.MarkupRenderer
import kotlin.math.pow import kotlin.math.pow
@ -291,19 +288,16 @@ object BaseUnitDescriptions {
yield("Lost ability (vs [${originalUnit.name}]): [${unique.text}]" to null) yield("Lost ability (vs [${originalUnit.name}]): [${unique.text}]" to null)
} }
for (promotion in betterUnit.promotions.filter { it !in originalUnit.promotions }) { for (promotion in betterUnit.promotions.filter { it !in originalUnit.promotions }) {
// Needs tr for **individual** translations (no bracket nesting), default separator would have extra blank
val effects = ruleset.unitPromotions[promotion]!!.uniques val effects = ruleset.unitPromotions[promotion]!!.uniques
.joinToString(",") { "{$it}" } // {} for individual translations, default separator would have extra blank .joinToString(",") { it.tr() }
yield("{$promotion} ($effects)" to "Promotion/$promotion") yield("{$promotion} ($effects)" to "Promotion/$promotion")
} }
} }
/** Prepares a WidgetGroup for display as tooltip to an upgrade /** Prepares a Widget with [information about the differences][getDifferences] between units.
* Specialized to the WorldScreen UnitAction button and Unit Overview upgrade icon - * Used by UnitUpgradeMenu (but formerly also for a tooltip).
* in both cases the [UnitAction][com.unciv.models.UnitAction] and [unitToUpgradeTo] have already been evaluated.
*/ */
fun getUpgradeTooltipActor(title: String, unitUpgrading: BaseUnit, unitToUpgradeTo: BaseUnit) =
getUpgradeInfoTable(title, unitUpgrading, unitToUpgradeTo).wrapScaled(0.667f)
fun getUpgradeInfoTable(title: String, unitUpgrading: BaseUnit, unitToUpgradeTo: BaseUnit): Table { fun getUpgradeInfoTable(title: String, unitUpgrading: BaseUnit, unitToUpgradeTo: BaseUnit): Table {
val ruleset = unitToUpgradeTo.ruleset val ruleset = unitToUpgradeTo.ruleset
val info = sequenceOf(FormattedLine(title, color = "#FDA", icon = unitToUpgradeTo.makeLink(), header = 5)) + val info = sequenceOf(FormattedLine(title, color = "#FDA", icon = unitToUpgradeTo.makeLink(), header = 5)) +
@ -313,11 +307,4 @@ object BaseUnitDescriptions {
infoTable.background = BaseScreen.skinStrings.getUiBackground("General/Tooltip", BaseScreen.skinStrings.roundedEdgeRectangleShape, Color.DARK_GRAY) infoTable.background = BaseScreen.skinStrings.getUiBackground("General/Tooltip", BaseScreen.skinStrings.roundedEdgeRectangleShape, Color.DARK_GRAY)
return infoTable return infoTable
} }
private fun Table.wrapScaled(scale: Float): WidgetGroup =
Container(this).apply {
touchable = Touchable.disabled
isTransform = true
setScale(scale)
}
} }