mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 23:40:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix not translated notifications (#2715)

Browse Source 
* Translate notification strings before they are shown. Fixes #2703

* Respect translations from active mods for placeholder translations

* Revert translation call to avoid issues in multiplayer. Still works without it.
This commit is contained in:
Daniel Bälz
2020-06-24 22:58:16 +02:00
committed by GitHub
parent de03a727f6
commit 5753115c30
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,16 +31,32 @@ class Translations : LinkedHashMap<String, TranslationEntry>(){
private var modsWithTranslations: HashMap<String, Translations> = hashMapOf() // key == mod name private var modsWithTranslations: HashMap<String, Translations> = hashMapOf() // key == mod name
/**
fun get(text: String, language: String, activeMods: HashSet<String>? = null): String { * Searches for the translation entry of a given [text] for a given [language].
* This includes translations provided by mods from [activeMods]
*
* @param text the input text for the translate entry
* @param language the inquired language
* @param activeMods set of the active mods that should include in the search
*
* @return the translation entry or null when not available
*/
fun get(text: String, language: String, activeMods: HashSet<String>? = null): TranslationEntry? {
activeMods?.forEach { activeMods?.forEach {
modsWithTranslations[it]?.let { modTranslations -> modsWithTranslations[it]?.let { modTranslations ->
val translation = modTranslations[text]?.get(language) val translationEntry = modTranslations[text]?.get(language)
if (translation != null) return translation if (translationEntry != null) return modTranslations[text]
} }
} }
return this[text]?.get(language) ?: text return this[text]
}
/**
* @see get
*/
fun getText(text: String, language: String, activeMods: HashSet<String>? = null): String {
return get(text, language, activeMods)?.get(language) ?: text
} }
fun getLanguages(): List<String> { fun getLanguages(): List<String> {
@ -205,6 +221,11 @@ val curlyBraceRegex = Regex("""\{([^}]*)\}""")
* but with placeholder or sentence brackets removed. * but with placeholder or sentence brackets removed.
*/ */
fun String.tr(): String { fun String.tr(): String {
val activeMods = if (UncivGame.Current.isGameInfoInitialized()) {
UncivGame.Current.gameInfo.gameParameters.mods
} else {
null
}
// There might still be optimization potential here! // There might still be optimization potential here!
if (contains("[")) { // Placeholders! if (contains("[")) { // Placeholders!
@ -224,7 +245,7 @@ fun String.tr(): String {
// Convert "work on [building] has completed in [city]" to "work on [] has completed in []" // Convert "work on [building] has completed in [city]" to "work on [] has completed in []"
val translationStringWithSquareBracketsOnly = this.replace(squareBraceRegex,"[]") val translationStringWithSquareBracketsOnly = this.replace(squareBraceRegex,"[]")
// That is now the key into the translation HashMap! // That is now the key into the translation HashMap!
val translationEntry = UncivGame.Current.translations[translationStringWithSquareBracketsOnly] val translationEntry = UncivGame.Current.translations.get(translationStringWithSquareBracketsOnly, UncivGame.Current.settings.language, activeMods)
if (translationEntry==null || if (translationEntry==null ||
!translationEntry.containsKey(UncivGame.Current.settings.language)){ !translationEntry.containsKey(UncivGame.Current.settings.language)){
@ -248,12 +269,5 @@ fun String.tr(): String {
return curlyBraceRegex.replace(this) { it.groups[1]!!.value.tr() } return curlyBraceRegex.replace(this) { it.groups[1]!!.value.tr() }
} }
val activeMods = if (UncivGame.Current.isGameInfoInitialized()) { return UncivGame.Current.translations.getText(this, UncivGame.Current.settings.language, activeMods)
UncivGame.Current.gameInfo.gameParameters.mods
} else {
null
}
return UncivGame.Current.translations
.get(this, UncivGame.Current.settings.language, activeMods)
} }

2
tests/src/com/unciv/testing/TranslationTests.kt
View File

@ -78,7 +78,7 @@ class TranslationTests {
val placeholders = placeholderPattern.findAll(translationEntry).map { it.value }.toList() val placeholders = placeholderPattern.findAll(translationEntry).map { it.value }.toList()
for (language in languages) { for (language in languages) {
for (placeholder in placeholders) { for (placeholder in placeholders) {
val output = translations.get(translationEntry, language) val output = translations.getText(translationEntry, language)
if (!output.contains(placeholder)) { if (!output.contains(placeholder)) {
allTranslationsHaveCorrectPlaceholders = false allTranslationsHaveCorrectPlaceholders = false
println("Placeholder `$placeholder` not found in `$language` for entry `$translationEntry`") println("Placeholder `$placeholder` not found in `$language` for entry `$translationEntry`")