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

Translations improvements, fixed few czech words

Browse Source
This commit is contained in:
sveckarel
2019-10-27 00:05:42 +02:00
committed by Yair Morgenstern
parent 64b420fb4f
commit c12ed1842c
8 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -62,8 +62,9 @@ class CityConstructions {
var result = currentConstructionSnapshot.tr()
if (currentConstructionSnapshot!=""
&& SpecialConstruction.getSpecialConstructions().none { it.name==currentConstructionSnapshot }) {
result += ("\r\nCost " + getConstruction(currentConstruction).getProductionCost(cityInfo.civInfo).toString()).tr()
result += "\r\n" + turnsToConstruction(currentConstructionSnapshot) + " {turns}".tr()
val turnsLeft = turnsToConstruction(currentConstructionSnapshot)
result += ("\r\n" + "Cost".tr() + " " + getConstruction(currentConstruction).getProductionCost(cityInfo.civInfo).toString()).tr()
result += "\r\n" + turnsLeft + (if(turnsLeft>1) " {turns}".tr() else " {turn}".tr())
}
return result
}
@ -72,8 +73,10 @@ class CityConstructions {
val currentConstructionSnapshot = currentConstruction // this is because there were rare errors tht I assume were caused because currentContruction changed on another thread
var result = currentConstructionSnapshot.tr()
if (currentConstructionSnapshot!=""
&& SpecialConstruction.getSpecialConstructions().none { it.name==currentConstructionSnapshot })
result += "\r\n{in} ".tr() + turnsToConstruction(currentConstructionSnapshot) + " {turns}".tr()
&& SpecialConstruction.getSpecialConstructions().none { it.name==currentConstructionSnapshot }) {
val turnsLeft = turnsToConstruction(currentConstructionSnapshot)
result += "\r\n" + turnsLeft + (if(turnsLeft>1) " {turns}".tr() else " {turn}".tr())
}
return result
}

9
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -94,10 +94,12 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
constructionPickerTable.background = ImageGetter.getBackground(Color.BLACK)
val units = ArrayList<Table>()
for (unit in GameBasics.Units.values.filter { it.shouldBeDisplayed(cityConstructions) })
for (unit in GameBasics.Units.values.filter { it.shouldBeDisplayed(cityConstructions) }) {
val turnsToUnit = cityConstructions.turnsToConstruction(unit.name)
units += getProductionButton(unit.name,
unit.name.tr() + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " {turns}".tr(),
unit.name.tr() + "\r\n" + turnsToUnit + (if(turnsToUnit>1) " {turns}".tr() else " {turn}".tr()),
unit.getRejectionReason(cityConstructions))
}
constructionPickerTable.addCategory("Units",units)
@ -107,8 +109,9 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
for (building in GameBasics.Buildings.values) {
if (!building.shouldBeDisplayed(cityConstructions) && building.name != cityConstructions.currentConstruction) continue
val turnsToBuilding = cityConstructions.turnsToConstruction(building.name)
val productionTextButton = getProductionButton(building.name,
building.name.tr() + "\r\n" + cityConstructions.turnsToConstruction(building.name) + " {turns}".tr(),
building.name.tr() + "\r\n" + turnsToBuilding + (if(turnsToBuilding>1) " {turns}".tr() else " {turn}".tr()),
building.getRejectionReason(cityConstructions)
)
if (building.isWonder)

8
core/src/com/unciv/ui/mapeditor/MapEditorOptionsTable.kt
View File

@ -42,7 +42,7 @@ class MapEditorOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEdi
}
add(clearCurrentMapButton).row()
val saveMapButton = TextButton("Save".tr(), skin)
val saveMapButton = TextButton("Save map".tr(), skin)
saveMapButton.onClick {
MapSaver().saveMap(mapEditorScreen.mapName,mapEditorScreen.tileMap)
UnCivGame.Current.setWorldScreen()
@ -57,13 +57,13 @@ class MapEditorOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEdi
}
add(copyMapAsTextButton).row()
val loadMapButton = TextButton("Load".tr(), skin)
val loadMapButton = TextButton("Load map".tr(), skin)
loadMapButton.onClick {
UnCivGame.Current.setScreen(LoadMapScreen(mapEditorScreen.tileMap))
}
add(loadMapButton).row()
val uploadMapButton = TextButton("Upload".tr(), skin)
val uploadMapButton = TextButton("Upload map".tr(), skin)
uploadMapButton.onClick {
try {
val gzippedMap = Gzip.zip(Json().toJson(mapEditorScreen.tileMap))
@ -85,7 +85,7 @@ class MapEditorOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEdi
}
add(uploadMapButton).row()
val downloadMapButton = TextButton("Download".tr(), skin)
val downloadMapButton = TextButton("Download map".tr(), skin)
downloadMapButton.onClick {
remove()
MapDownloadTable(mapEditorScreen)

2
core/src/com/unciv/ui/saves/SaveGameScreen.kt
View File

@ -26,7 +26,7 @@ class SaveGameScreen : PickerScreen() {
topTable.add(ScrollPane(currentSaves)).height(stage.height*2/3)
val newSave = Table()
val defaultSaveName = game.gameInfo.currentPlayer+" - "+game.gameInfo.turns+" turns"
val defaultSaveName = game.gameInfo.currentPlayer+" - "+game.gameInfo.turns+" "+"turns".tr()
textField.text = defaultSaveName
newSave.add("Saved game name".toLabel()).row()