mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-11 18:39:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conditionals display when locating mod errors, which ws broken due to translation reordering all conditional-like text

Browse Source
This commit is contained in:
yairm210 2021-10-06 20:47:06 +03:00
parent 5e8e23fb43
commit 44fd987160
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,7 @@ class Ruleset {
if (deprecationAnnotation != null) { if (deprecationAnnotation != null) {
val deprecationText = val deprecationText =
"$name's unique \"${unique.text}\" is deprecated ${deprecationAnnotation.message}," + "$name's unique \"${unique.text}\" is deprecated ${deprecationAnnotation.message}," +
" replace with \"${deprecationAnnotation.replaceWith.expression}\"" if (deprecationAnnotation.replaceWith.expression != "") " replace with \"${deprecationAnnotation.replaceWith.expression}\"" else ""
val severity = if (deprecationAnnotation.level == DeprecationLevel.WARNING) val severity = if (deprecationAnnotation.level == DeprecationLevel.WARNING)
RulesetErrorSeverity.WarningOptionsOnly // Not user-visible RulesetErrorSeverity.WarningOptionsOnly // Not user-visible
else RulesetErrorSeverity.Warning // User visible else RulesetErrorSeverity.Warning // User visible

25
core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
View File

@ -277,28 +277,39 @@ class OptionsPopup(val previousScreen: CameraStageBaseScreen) : Popup(previousSc
var noProblem = true var noProblem = true
for (mod in RulesetCache.values.sortedBy { it.name }) { for (mod in RulesetCache.values.sortedBy { it.name }) {
// Appending {} is a dirty trick to deactivate the automatic translation which would drop [] from unique messages // Appending {} is a dirty trick to deactivate the automatic translation which would drop [] from unique messages
lines += FormattedLine("$mod{}", starred = true, header = 3) lines += FormattedLine("$mod", starred = true, header = 3)
val modLinks = val modLinks =
if (complex) RulesetCache.checkCombinedModLinks(linkedSetOf(mod.name)) if (complex) RulesetCache.checkCombinedModLinks(linkedSetOf(mod.name))
else mod.checkModLinks() else mod.checkModLinks()
for (error in modLinks.sortedByDescending { it.errorSeverityToReport }) { for (error in modLinks.sortedByDescending { it.errorSeverityToReport }) {
val color = when (error.errorSeverityToReport) { val color = when (error.errorSeverityToReport) {
Ruleset.RulesetErrorSeverity.OK -> "#0F0" Ruleset.RulesetErrorSeverity.OK -> "#00FF00"
Ruleset.RulesetErrorSeverity.Warning, Ruleset.RulesetErrorSeverity.Warning,
Ruleset.RulesetErrorSeverity.WarningOptionsOnly -> "#FF0" Ruleset.RulesetErrorSeverity.WarningOptionsOnly -> "#FFFF00"
Ruleset.RulesetErrorSeverity.Error -> "#F00" Ruleset.RulesetErrorSeverity.Error -> "#FF0000"
} }
lines += FormattedLine(error.text, color = color) lines += FormattedLine(error.text, color = color)
} }
if (modLinks.isNotOK()) noProblem = false if (modLinks.isNotOK()) noProblem = false
lines += FormattedLine() lines += FormattedLine()
} }
if (noProblem) lines += FormattedLine("{No problems found}.") if (noProblem) lines += FormattedLine("{No problems found}.",)
Gdx.app.postRunnable { Gdx.app.postRunnable {
val result = SimpleCivilopediaText(lines).renderCivilopediaText(tabs.prefWidth - 25f) // Don't just render text, since that will make all the conditionals in the mod replacement messages move to the end, which makes it unreadable
modCheckResultCell?.setActor(result) // Don't use .toLabel() either, since that activates translations as well, which is what we're trying to avoid,
// Instead, some manual work needs to be put in.
val resultTable = Table().apply { defaults().align(Align.left) }
for (line in lines) {
val label = if (line.starred) Label(line.text+"\n", CameraStageBaseScreen.skin)
.apply { setFontScale(22 / Fonts.ORIGINAL_FONT_SIZE) }
else Label(line.text+"\n", CameraStageBaseScreen.skin)
.apply { if (line.color != "") color = Color.valueOf(line.color) }
label.wrap = true
resultTable.add(label).width(stage.width/2).row()
}
modCheckResultCell?.setActor(resultTable)
modCheckCheckBox!!.enable() modCheckCheckBox!!.enable()
} }
} }