From 46b1516159e62840b53abcbe76e3176d0e84e2be Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 13 Jun 2022 22:22:52 +0300 Subject: [PATCH] Fixed translation order --- core/src/com/unciv/models/translations/Translations.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/models/translations/Translations.kt b/core/src/com/unciv/models/translations/Translations.kt index 3499af9f68..fc7da3dd01 100644 --- a/core/src/com/unciv/models/translations/Translations.kt +++ b/core/src/com/unciv/models/translations/Translations.kt @@ -350,10 +350,6 @@ fun String.tr(): String { return fullyTranslatedString } - if (contains('{')) { // Translating partial sentences - return curlyBraceRegex.replace(this) { it.groups[1]!!.value.tr() } - } - // There might still be optimization potential here! if (contains('[')) { // Placeholders! /** @@ -403,6 +399,12 @@ fun String.tr(): String { 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() val translation = UncivGame.Current.translations.getText(this, language, TranslationActiveModsCache.activeMods)