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

Resolved #1918 - added missing translations

Browse Source
This commit is contained in:
Yair Morgenstern
2020-02-14 13:38:05 +02:00
parent 99111df5c6
commit fa31704217
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/jsons/translationsByLanguage/template.properties
View File

@ -442,10 +442,13 @@ Introduction to [nation] =
Declare war on [nation] = Declare war on [nation] =
Luxury resources = Luxury resources =
Strategic resources = Strategic resources =
replaces =
# Nation picker
[resourceName] not required = [resourceName] not required =
Lost ability = Lost ability =
National ability = National ability =
[firstValue] vs [secondValue] =
# Nations # Nations
@ -652,6 +655,7 @@ Load [saveFileName] =
Delete save = Delete save =
Saved at = Saved at =
Load map = Load map =
Delete map =
Are you sure you want to delete this map? = Are you sure you want to delete this map? =
Upload map = Upload map =
Could not upload map! = Could not upload map! =

24
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -101,22 +101,22 @@ class Nation : INamed {
.filter { it.uniqueTo == name }) { .filter { it.uniqueTo == name }) {
val originalBuilding = ruleset.buildings[building.replaces!!]!! val originalBuilding = ruleset.buildings[building.replaces!!]!!
textList += building.name.tr() + " - {replaces} " + originalBuilding.name.tr() textList += building.name.tr() + " - "+"Replaces [${originalBuilding.name}]".tr()
val originalBuildingStatMap = originalBuilding.toHashMap() val originalBuildingStatMap = originalBuilding.toHashMap()
for (stat in building.toHashMap()) for (stat in building.toHashMap())
if (stat.value != originalBuildingStatMap[stat.key]) if (stat.value != originalBuildingStatMap[stat.key])
textList += " " + stat.key.toString().tr() + " " + stat.value.toInt() + " vs " + originalBuildingStatMap[stat.key]!!.toInt() textList += " " + stat.key.toString().tr() + " " + "[${stat.value.toInt()}] vs [${originalBuildingStatMap[stat.key]!!.toInt()}]".tr()
for (unique in building.uniques.filter { it !in originalBuilding.uniques }) for (unique in building.uniques.filter { it !in originalBuilding.uniques })
textList += " " + unique.tr() textList += " " + unique.tr()
if (building.maintenance != originalBuilding.maintenance) if (building.maintenance != originalBuilding.maintenance)
textList += " {Maintenance} " + building.maintenance + " vs " + originalBuilding.maintenance textList += " {Maintenance} " + "[${building.maintenance}] vs [${originalBuilding.maintenance}]".tr()
if (building.cost != originalBuilding.cost) if (building.cost != originalBuilding.cost)
textList += " {Cost} " + building.cost + " vs " + originalBuilding.cost textList += " {Cost} " + "[${building.cost}] vs [${originalBuilding.cost}]".tr()
if (building.cityStrength != originalBuilding.cityStrength) if (building.cityStrength != originalBuilding.cityStrength)
textList += " {City strength} " + building.cityStrength + " vs " + originalBuilding.cityStrength textList += " {City strength} " + "[${building.cityStrength}] vs [${originalBuilding.cityStrength}]".tr()
if (building.cityHealth != originalBuilding.cityHealth) if (building.cityHealth != originalBuilding.cityHealth)
textList += " {City health} " + building.cityHealth + " vs " + originalBuilding.cityHealth textList += " {City health} " + "[${building.cityHealth}] vs [${originalBuilding.cityHealth}]".tr()
textList += "" textList += ""
} }
} }
@ -126,17 +126,17 @@ class Nation : INamed {
.filter { it.uniqueTo == name }) { .filter { it.uniqueTo == name }) {
val originalUnit = ruleset.units[unit.replaces!!]!! val originalUnit = ruleset.units[unit.replaces!!]!!
textList += unit.name.tr() + " - {replaces} " + originalUnit.name.tr() textList += unit.name.tr() + " - "+"Replaces [${originalUnit.name}]".tr()
if (unit.cost != originalUnit.cost) if (unit.cost != originalUnit.cost)
textList += " {Cost} " + unit.cost + " vs " + originalUnit.cost textList += " {Cost} " + "[${unit.cost}] vs [${originalUnit.cost}]".tr()
if (unit.strength != originalUnit.strength) if (unit.strength != originalUnit.strength)
textList += " {Strength} " + unit.strength + " vs " + originalUnit.strength textList += " {Strength} " + "[${unit.strength}] vs [${originalUnit.strength}]".tr()
if (unit.rangedStrength != originalUnit.rangedStrength) if (unit.rangedStrength != originalUnit.rangedStrength)
textList += " {Ranged strength} " + unit.rangedStrength + " vs " + originalUnit.rangedStrength textList += " {Ranged strength} " + "[${unit.rangedStrength}] vs [${originalUnit.rangedStrength}]".tr()
if (unit.range != originalUnit.range) if (unit.range != originalUnit.range)
textList += " {Range} " + unit.range + " vs " + originalUnit.range textList += " {Range} " + unit.range + "[${unit.range}] vs [${originalUnit.range}]".tr()
if (unit.movement != originalUnit.movement) if (unit.movement != originalUnit.movement)
textList += " {Movement} " + unit.movement + " vs " + originalUnit.movement textList += " {Movement} " + "[${unit.movement}] vs [${originalUnit.movement}]".tr()
if (originalUnit.requiredResource != null && unit.requiredResource == null) if (originalUnit.requiredResource != null && unit.requiredResource == null)
textList += " " + "[${originalUnit.requiredResource}] not required".tr() textList += " " + "[${originalUnit.requiredResource}] not required".tr()
for (unique in unit.uniques.filterNot { it in originalUnit.uniques }) for (unique in unit.uniques.filterNot { it in originalUnit.uniques })

2
core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
View File

@ -15,7 +15,7 @@ import com.unciv.ui.utils.*
class LoadMapScreen(previousMap: TileMap?) : PickerScreen(){ class LoadMapScreen(previousMap: TileMap?) : PickerScreen(){
var chosenMap = "" var chosenMap = ""
val deleteMapButton = TextButton("Delete map",skin) val deleteMapButton = TextButton("Delete map".tr(),skin)
init { init {
rightSideButton.setText("Load map".tr()) rightSideButton.setText("Load map".tr())