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

Fix for placeholder parameters changing names and becoming out of sync with existing translations.

Browse Source 
Relevant to #4402
This commit is contained in:
Yair Morgenstern
2021-07-09 10:16:39 +03:00
parent 37942a1af6
commit edad1e10a2
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/models/translations/TranslationFileWriter.kt
View File

@ -109,6 +109,24 @@ object TranslationFileWriter {
translationsOfThisLanguage++
} else stringBuilder.appendLine(" # Requires translation!")
// THE PROBLEM
// When we come to change params written in the TranslationFileWriter,
// this messes up the param name matching in existing translations.
// Tests fail and much manual work was required.
// SO, as a fix, for each translation where a single param is different than in the source line,
// we try to autocorrect it.
if (translationValue.contains('[')) {
val paramsOfKey = translationKey.getPlaceholderParameters()
val paramsOfValue = translationValue.getPlaceholderParameters()
val paramsOfKeyNotInValue = paramsOfKey.filterNot { it in paramsOfValue }
val paramsOfValueNotInKey = paramsOfValue.filterNot { it in paramsOfKey }
if (paramsOfKeyNotInValue.size == 1 && paramsOfValueNotInKey.size == 1)
translationValue = translationValue.replace(
"[" + paramsOfValueNotInKey.first() + "]",
"[" + paramsOfKeyNotInValue.first() + "]"
)
}
val lineToWrite = translationKey.replace("\n", "\\n") +
" = " + translationValue.replace("\n", "\\n")
stringBuilder.appendLine(lineToWrite)
@ -204,7 +222,7 @@ object TranslationFileWriter {
|| parameter == "non-fresh water"
|| parameter == "Open Terrain"
|| parameter == "Rough Terrain"
-> "terrain"
-> "tileFilter"
RulesetCache.getBaseRuleset().units.containsKey(parameter) -> "unit"
RulesetCache.getBaseRuleset().tileImprovements.containsKey(parameter)
|| parameter == "Great Improvement"