AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor translation changes

Browse Source
This commit is contained in:
Yair Morgenstern 2018-12-10 18:10:19 +02:00
parent 437c422817
commit ec80dcc0c0
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Translations.json
View File

@ -3690,6 +3690,7 @@
Portuguese:"Edifícios" Portuguese:"Edifícios"
} }
"Wonders":{} "Wonders":{}
"Specialist Buildings":{}
"Population":{ "Population":{
Italian:"Popolazione" Italian:"Popolazione"
Russian:"Население" Russian:"Население"

2
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -173,7 +173,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
val mapping = playerCivInfo.greatPeople.statToGreatPersonMapping val mapping = playerCivInfo.greatPeople.statToGreatPersonMapping
for(entry in mapping){ for(entry in mapping){
greatPeopleTable.add(entry.value) greatPeopleTable.add(entry.value.tr())
greatPeopleTable.add(greatPersonPoints[entry.key]!!.toInt().toString()+"/"+pointsToGreatPerson) greatPeopleTable.add(greatPersonPoints[entry.key]!!.toInt().toString()+"/"+pointsToGreatPerson)
greatPeopleTable.add(greatPersonPointsPerTurn[entry.key]!!.toInt().toString()).row() greatPeopleTable.add(greatPersonPointsPerTurn[entry.key]!!.toInt().toString()).row()
} }

6
core/src/com/unciv/ui/cityscreen/BuildingsTable.kt
View File

@ -35,7 +35,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table(CameraStageBase
} }
if (!wonders.isEmpty()) { if (!wonders.isEmpty()) {
val wondersExpander = ExpanderTab("Wonders",skin) val wondersExpander = ExpanderTab("Wonders".tr(),skin)
for (building in wonders) { for (building in wonders) {
wondersExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f)) wondersExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
wondersExpander.innerTable.add(Label(building.name.tr(), skin)).pad(5f).align(Align.left).row() wondersExpander.innerTable.add(Label(building.name.tr(), skin)).pad(5f).align(Align.left).row()
@ -44,7 +44,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table(CameraStageBase
} }
if (!specialistBuildings.isEmpty()) { if (!specialistBuildings.isEmpty()) {
val specialistBuildingsExpander = ExpanderTab("Specialist Buildings",skin) val specialistBuildingsExpander = ExpanderTab("Specialist Buildings".tr(),skin)
for (building in specialistBuildings) { for (building in specialistBuildings) {
specialistBuildingsExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f)) specialistBuildingsExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
specialistBuildingsExpander.innerTable.add(Label(building.name.tr(), skin)).pad(5f) specialistBuildingsExpander.innerTable.add(Label(building.name.tr(), skin)).pad(5f)
@ -63,7 +63,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table(CameraStageBase
} }
if (!others.isEmpty()) { if (!others.isEmpty()) {
val buildingsExpanderTab = ExpanderTab("Buildings",skin) val buildingsExpanderTab = ExpanderTab("Buildings".tr(),skin)
for (building in others) { for (building in others) {
buildingsExpanderTab.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f)) buildingsExpanderTab.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
buildingsExpanderTab.innerTable.add(Label(building.name.tr(), skin)).pad(5f).row() buildingsExpanderTab.innerTable.add(Label(building.name.tr(), skin)).pad(5f).row()

6
core/src/com/unciv/ui/cityscreen/CityStatsTable.kt
View File

@ -23,12 +23,6 @@ class CityStatsTable(val cityScreen: CityScreen) : Table(){
columnDefaults(0).padRight(10f) columnDefaults(0).padRight(10f)
clear() clear()
val cityStatsHeader = Label("City Stats", CameraStageBaseScreen.skin)
cityStatsHeader.setFontSize(15)
add(cityStatsHeader).colspan(2).pad(10f)
row()
val cityStatsValues = LinkedHashMap<String, String>() val cityStatsValues = LinkedHashMap<String, String>()
cityStatsValues["Production"] = Math.round(stats.production).toString() + city.cityConstructions.getAmountConstructedText() cityStatsValues["Production"] = Math.round(stats.production).toString() + city.cityConstructions.getAmountConstructedText()
cityStatsValues["Food"] = (Math.round(stats.food).toString() cityStatsValues["Food"] = (Math.round(stats.food).toString()