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

Can now translate [year] BC / [year] AD (#1240)

Browse Source
This commit is contained in:
Yair Morgenstern 2019-10-26 20:27:01 +03:00
parent dd69a1250e
commit 4d285e972d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,14 +617,15 @@
Portuguese:"IDADE DOURADA" Portuguese:"IDADE DOURADA"
Japanese:"黄金時代" Japanese:"黄金時代"
Czech:"ZLATÝ VĚK" Czech:"ZLATÝ VĚK"
} },
" BC":{ // Before Christus // You don't have to translate this is it's good for your language, but some languages have their own display
Czech:" př. n. l." "[year] BC":{ // Before Christus
Czech:"[year] př. n. l."
}, },
" AC":{ // Anno Domini "[year] AD":{ // Anno Domini
Czech:" n. l." Czech:"[year] n. l."
}, },
/////// Menu table /////// Menu table

10
core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
View File

@ -18,6 +18,7 @@ import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.optionstable.WorldScreenMenuTable import com.unciv.ui.worldscreen.optionstable.WorldScreenMenuTable
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.roundToInt
class WorldScreenTopBar(val screen: WorldScreen) : Table() { class WorldScreenTopBar(val screen: WorldScreen) : Table() {
@ -128,13 +129,14 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
else -> 2020+(turns-440)/2 else -> 2020+(turns-440)/2
} }
turnsLabel.setText("Turn".tr()+" " + civInfo.gameInfo.turns + " | "+ abs(year)+(if (year<0) " BC.tr()" else " AD.tr()")) val yearText = "["+ abs(year)+"] "+ if (year<0) "BC" else "AD"
turnsLabel.setText("Turn".tr()+" " + civInfo.gameInfo.turns + " | "+ yearText.tr())
val nextTurnStats = civInfo.statsForNextTurn val nextTurnStats = civInfo.statsForNextTurn
val goldPerTurn = "(" + (if (nextTurnStats.gold > 0) "+" else "") + Math.round(nextTurnStats.gold) + ")" val goldPerTurn = "(" + (if (nextTurnStats.gold > 0) "+" else "") + nextTurnStats.gold.roundToInt() + ")"
goldLabel.setText(Math.round(civInfo.gold.toFloat()).toString() + goldPerTurn) goldLabel.setText(civInfo.gold.toFloat().roundToInt().toString() + goldPerTurn)
scienceLabel.setText("+" + Math.round(nextTurnStats.science)) scienceLabel.setText("+" + nextTurnStats.science.roundToInt())
happinessLabel.setText(getHappinessText(civInfo)) happinessLabel.setText(getHappinessText(civInfo))