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

Fixed translation order

Browse Source
This commit is contained in:
Yair Morgenstern
2022-06-13 22:22:52 +03:00
parent 86f2560d7e
commit 46b1516159
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,10 +350,6 @@ fun String.tr(): String {
return fullyTranslatedString return fullyTranslatedString
} }
if (contains('{')) { // Translating partial sentences
return curlyBraceRegex.replace(this) { it.groups[1]!!.value.tr() }
}
// There might still be optimization potential here! // There might still be optimization potential here!
if (contains('[')) { // Placeholders! if (contains('[')) { // Placeholders!
/** /**
@ -403,6 +399,12 @@ fun String.tr(): String {
return languageSpecificPlaceholder // every component is already translated return languageSpecificPlaceholder // every component is already translated
} }
if (contains('{')) { // Translating partial sentences
return curlyBraceRegex.replace(this) { it.groups[1]!!.value.tr() }
}
if (Stats.isStats(this)) return Stats.parse(this).toString() if (Stats.isStats(this)) return Stats.parse(this).toString()
val translation = UncivGame.Current.translations.getText(this, language, TranslationActiveModsCache.activeMods) val translation = UncivGame.Current.translations.getText(this, language, TranslationActiveModsCache.activeMods)