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

There were somes things that were in the translations files but weren't translated in-game

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-28 23:43:18 +03:00
parent d0cb10abbe
commit 3fbcc019e3
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 991 KiB

After

Width:  |  Height:  |  Size: 991 KiB

7
android/assets/jsons/Translations/Other.json
View File

@ -950,7 +950,7 @@
} }
"Pick now!": { "Pick now!": {
Italian: "Scegli ora!" //You didn't translate this in Italian, said Smashfanful Italian: "Scegli ora!"
German: "Jetzt wählen!" German: "Jetzt wählen!"
} }
@ -1079,7 +1079,7 @@
} }
"Stopped expansion":{ // if culture is 0 "Stopped expansion":{ // if culture is 0
Italian:"Espansione arrestata" //You didn't translate this in Italian, said Smashfanful Italian:"Espansione arrestata"
Russian:"Расширение остановлено" Russian:"Расширение остановлено"
French:"Expansion arrêtée" French:"Expansion arrêtée"
Romanian:"Expansiunea sa oprit" Romanian:"Expansiunea sa oprit"
@ -2474,7 +2474,7 @@
} }
"[tradeOffer] from [otherCivName] has ended":{ "[tradeOffer] from [otherCivName] has ended":{
Italian:"Accordo di [tradeOffer] da [otherCivName] terminato" //You didn't translate this in Italian, said Smashfanful Italian:"Accordo di [tradeOffer] da [otherCivName] terminato"
Simplified_Chinese:"与[civName]的[tradeOffer]协议已经结束" Simplified_Chinese:"与[civName]的[tradeOffer]协议已经结束"
French:"[tradeOffer] de [otherCivName] a pris fin" French:"[tradeOffer] de [otherCivName] a pris fin"
Portuguese:"[tradeOffer] de [otherCivName] terminou" Portuguese:"[tradeOffer] de [otherCivName] terminou"
@ -3212,6 +3212,7 @@
"Occurs on [listOfTerrains]":{ //For civilopedia again "Occurs on [listOfTerrains]":{ //For civilopedia again
Italian:"Può avvenire/avviene su [listOfTerrains]" Italian:"Può avvenire/avviene su [listOfTerrains]"
}
"Requires worked [resource] near city":{ "Requires worked [resource] near city":{

2
android/build.gradle
View File

@ -21,7 +21,7 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 249 versionCode 250
versionName "2.17.0" versionName "2.17.0"
} }

2
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -120,7 +120,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
/ city.cityStats.currentCityStats.culture).toInt() / city.cityStats.currentCityStats.culture).toInt()
turnsToExpansionString = "[$turnsToExpansion] turns to expansion".tr() turnsToExpansionString = "[$turnsToExpansion] turns to expansion".tr()
} else { } else {
turnsToExpansionString = "Stopped expansion" turnsToExpansionString = "Stopped expansion".tr()
} }
table.add(Label(turnsToExpansionString + " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")", table.add(Label(turnsToExpansionString + " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")",
skin)).colspan(columns).row() skin)).colspan(columns).row()

9
core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
View File

@ -2,8 +2,10 @@ package com.unciv.ui.pickerscreens
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.TileImprovement import com.unciv.models.gamebasics.tile.TileImprovement
@ -59,8 +61,7 @@ class ImprovementPickerScreen(tileInfo: TileInfo, onAccept: ()->Unit) : PickerSc
descriptionLabel.setText(improvement.description) descriptionLabel.setText(improvement.description)
} }
val pickNow = Label("Pick now!", skin) val pickNow = "Pick now!".toLabel()
pickNow.touchable = Touchable.enabled
pickNow.onClick { pickNow.onClick {
accept(improvement) accept(improvement)
} }

4
core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
View File

@ -3,7 +3,6 @@ package com.unciv.ui.pickerscreens
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Button import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
@ -74,8 +73,7 @@ class PromotionPickerScreen(mapUnit: MapUnit) : PickerScreen() {
descriptionLabel.setText(descriptionText) descriptionLabel.setText(descriptionText)
} }
val pickNow = Label("Pick now!", skin) val pickNow = "Pick now!".toLabel()
pickNow.touchable = Touchable.enabled
pickNow.setAlignment(Align.center) pickNow.setAlignment(Align.center)
pickNow.onClick { pickNow.onClick {
accept(promotion) accept(promotion)