From 5e8e23fb4361fe0f10862b5a44db47c068ea3dfe Mon Sep 17 00:00:00 2001 From: yairm210 Date: Wed, 6 Oct 2021 19:06:53 +0300 Subject: [PATCH] Fixed broken translations --- android/assets/jsons/translations/German.properties | 2 +- android/assets/jsons/translations/Indonesian.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- .../assets/jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- android/assets/jsons/translations/Swedish.properties | 2 +- core/src/com/unciv/models/ruleset/Ruleset.kt | 5 +++-- core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 4 ++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 6b545fc6bc..3b5ace8d7d 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -4279,7 +4279,7 @@ Krakatoa = Krakatau Neighboring tiles will convert to [baseTerrain] = Benachbarte Felder werden in [baseTerrain] umgewandelt Rock of Gibraltar = Felsen von Gibraltar -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Benachbarte Felder, außer [param2], werden in [param] umgewandelt +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Benachbarte Felder, außer [baseTerrain2], werden in [baseTerrain] umgewandelt Cerro de Potosi = Cerro de Potosí diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 65b374a180..d5a5849de3 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -4279,7 +4279,7 @@ Krakatoa = Krakatau Neighboring tiles will convert to [baseTerrain] = Daerah yang bersebelahan akan berubah menjadi [baseTerrain] Rock of Gibraltar = Batu Gibraltar -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Daerah yang bersebelahan kecuali [param] akan berubah menjadi [param2] +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Daerah yang bersebelahan kecuali [baseTerrain] akan berubah menjadi [baseTerrain2] Cerro de Potosi = Cerro de Potosi diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index be91b01c13..0462487d06 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -4281,7 +4281,7 @@ Krakatoa = Krakatoa Neighboring tiles will convert to [baseTerrain] = Le caselle vicine si convertiranno a [baseTerrain] Rock of Gibraltar = Rocca di Gibilterra -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Le caselle vicine tranne [param2] si convertiranno a [param] +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Le caselle vicine tranne [baseTerrain2] si convertiranno a [baseTerrain] Cerro de Potosi = Cerro Rico de Potosí diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 9421afe80d..5b548371b3 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -4328,7 +4328,7 @@ Krakatoa = 喀拉喀托火山 Neighboring tiles will convert to [baseTerrain] = 相邻地块将转化为[baseTerrain] Rock of Gibraltar = 直布罗陀巨岩 -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = 相邻地块除了[param]将会转化为[param2] +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = 相邻地块除了[baseTerrain]将会转化为[baseTerrain2] Cerro de Potosi = 富饶山 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 8644d9624e..6bf32dbe87 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -4378,7 +4378,7 @@ Krakatoa = Krakatoa Neighboring tiles will convert to [baseTerrain] = Casillas contiguas se convertirán en [baseTerrain] Rock of Gibraltar = Peñón de Gibraltar -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Casillas contiguas excepto [param2] se convertirán en [param] +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Casillas contiguas excepto [baseTerrain2] se convertirán en [baseTerrain] Cerro de Potosi = Cerro de Potosi diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 62673818bf..eff2b1c262 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -4279,7 +4279,7 @@ Krakatoa = Krakatoa Neighboring tiles will convert to [baseTerrain] = Angränsande rutor omvandlas till [baseTerrain] Rock of Gibraltar = Gibraltarklippan -Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Angränsande rutor utom [param2] omvandlas till [param] +Neighboring tiles except [baseTerrain] will convert to [baseTerrain2] = Angränsande rutor utom [baseTerrain2] omvandlas till [baseTerrain] Cerro de Potosi = Cerro de Potosi diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt index b4c53ee814..64bc1a3a86 100644 --- a/core/src/com/unciv/models/ruleset/Ruleset.kt +++ b/core/src/com/unciv/models/ruleset/Ruleset.kt @@ -579,12 +579,13 @@ class Ruleset { checkUniques(reward, lines, UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific) } for (promotion in unitPromotions.values) { + // These are warning as of 3.17.5 to not break existing mods and give them time to correct, should be upgraded to error in the future for (prereq in promotion.prerequisites) if (!unitPromotions.containsKey(prereq)) - lines += "${promotion.name} requires promotion $prereq which does not exist!" + lines.add("${promotion.name} requires promotion $prereq which does not exist!", RulesetErrorSeverity.Warning) for (unitType in promotion.unitTypes) if (!unitTypes.containsKey(unitType) && (unitTypes.isNotEmpty() || !baseRuleset.unitTypes.containsKey(unitType))) - lines += "${promotion.name} references unit type ${unitType}, which does not exist!" + lines.add("${promotion.name} references unit type ${unitType}, which does not exist!", RulesetErrorSeverity.Warning) checkUniques(promotion, lines, UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific) } for (unitType in unitTypes.values) { diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index f93621cdb0..27e82c8d2a 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -132,9 +132,9 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) { StrengthPlus("+[amount]% Strength", UniqueTarget.Unit), @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING) StrengthMin("-[amount]% Strength", UniqueTarget.Unit), - @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength OR [amount]% Strength "), DeprecationLevel.WARNING) + @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength /"), DeprecationLevel.WARNING) StrengthPlusVs("+[amount]% Strength vs [combatantFilter]", UniqueTarget.Unit), - @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength OR [amount]% Strength "), DeprecationLevel.WARNING) + @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength /"), DeprecationLevel.WARNING) StrengthMinVs("-[amount]% Strength vs [combatantFilter]", UniqueTarget.Unit), @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING) CombatBonus("+[amount]% Combat Strength", UniqueTarget.Unit),