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

Unify placeholder parsing for unique parameters (#10072)

Browse Source 
* Unify placeholder parsing for unique parameters

* Remove double "remove conditional" call - kudos @SomeTroglodyte
This commit is contained in:
Yair Morgenstern
2023-09-07 09:57:40 +03:00
committed by GitHub
parent e8c740da31
commit 30570747a8
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -13,7 +13,6 @@ import com.unciv.models.stats.Stats
import com.unciv.models.translations.getConditionals
import com.unciv.models.translations.getPlaceholderParameters
import com.unciv.models.translations.getPlaceholderText
import com.unciv.models.translations.removeConditionals
import kotlin.random.Random
@ -21,7 +20,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
/** This is so the heavy regex-based parsing is only activated once per unique, instead of every time it's called
* - for instance, in the city screen, we call every tile unique for every tile, which can lead to ANRs */
val placeholderText = text.getPlaceholderText()
val params = text.removeConditionals().getPlaceholderParameters()
val params = text.getPlaceholderParameters()
val type = UniqueType.values().firstOrNull { it.placeholderText == placeholderText }
val stats: Stats by lazy {

21
core/src/com/unciv/models/translations/Translations.kt
View File

@ -400,9 +400,9 @@ fun String.tr(hideIcons:Boolean = false): String {
}
// Take the terms in the message, WITHOUT square brackets
val termsInMessage = this.getPlaceholderParametersIgnoringLowerLevelBraces()
val termsInMessage = this.getPlaceholderParameters()
// Take the terms from the placeholder
val termsInTranslationPlaceholder = originalEntry.getPlaceholderParametersIgnoringLowerLevelBraces()
val termsInTranslationPlaceholder = originalEntry.getPlaceholderParameters()
if (termsInMessage.size != termsInTranslationPlaceholder.size)
throw Exception("Message $this has a different number of terms than the placeholder $translationEntry!")
@ -438,17 +438,19 @@ fun String.tr(hideIcons:Boolean = false): String {
* For example, a string like 'The city of [New [York]]' will return ['New [York]'],
* allowing us to have nested translations!
*/
fun String.getPlaceholderParametersIgnoringLowerLevelBraces(): List<String> {
fun String.getPlaceholderParameters(): List<String> {
if (!this.contains('[')) return emptyList()
val stringToParse = this.removeConditionals()
val parameters = ArrayList<String>()
var depthOfBraces = 0
var startOfCurrentParameter = -1
for (i in this.indices) {
if (this[i] == '[') {
for (i in stringToParse.indices) {
if (stringToParse[i] == '[') {
if (depthOfBraces == 0) startOfCurrentParameter = i+1
depthOfBraces++
}
if (this[i] == ']' && depthOfBraces > 0) {
if (stringToParse[i] == ']' && depthOfBraces > 0) {
depthOfBraces--
if (depthOfBraces == 0) parameters.add(substring(startOfCurrentParameter,i))
}
@ -458,7 +460,7 @@ fun String.getPlaceholderParametersIgnoringLowerLevelBraces(): List<String> {
fun String.getPlaceholderText(): String {
var stringToReturn = this.removeConditionals()
val placeholderParameters = stringToReturn.getPlaceholderParametersIgnoringLowerLevelBraces()
val placeholderParameters = stringToReturn.getPlaceholderParameters()
for (placeholderParameter in placeholderParameters)
stringToReturn = stringToReturn.replace("[$placeholderParameter]", "[]")
return stringToReturn
@ -474,11 +476,6 @@ fun String.hasPlaceholderParameters(): Boolean {
return squareBraceRegex.containsMatchIn(this.removeConditionals())
}
fun String.getPlaceholderParameters(): List<String> {
if (!this.contains('[')) return emptyList()
return squareBraceRegex.findAll(this.removeConditionals()).map { it.groups[1]!!.value }.toList()
}
/** Substitutes placeholders with [strings], respecting order of appearance. */
fun String.fillPlaceholders(vararg strings: String): String {
val keys = this.getPlaceholderParameters()