mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-04 23:40:01 +07:00
Make "Help" button clearer and translatable, random nation indicators and labels translatable. (#6013)
* Make unknown nation placeholder translatable. * Make MultiplayerScreen help button clearer and translatable. * Use `Constants.spectator` more. * Make random/unknown nation icon translatable.
This commit is contained in:
@ -344,6 +344,10 @@ Cultural =
|
||||
Diplomatic =
|
||||
Time =
|
||||
|
||||
# Used for random nation indicator in empire selector and unknown nation icons in various overview screens.
|
||||
# Should be a single character, or at least visually square.
|
||||
? =
|
||||
|
||||
Map Shape =
|
||||
Hexagonal =
|
||||
Rectangular =
|
||||
@ -429,6 +433,7 @@ Anything above 40 may work very slowly on Android! =
|
||||
|
||||
# Multiplayer
|
||||
|
||||
Help =
|
||||
Username =
|
||||
Multiplayer =
|
||||
Could not download game! =
|
||||
@ -752,6 +757,8 @@ We Love The King Day =
|
||||
[year] BC =
|
||||
[year] AD =
|
||||
Civilopedia =
|
||||
# Display name of unknown nations.
|
||||
??? =
|
||||
|
||||
Start new game =
|
||||
Save game =
|
||||
|
@ -37,6 +37,7 @@ object Constants {
|
||||
const val researchAgreement = "Research Agreement"
|
||||
const val openBorders = "Open Borders"
|
||||
const val random = "Random"
|
||||
const val unknownNationName = "???"
|
||||
|
||||
const val fort = "Fort"
|
||||
const val citadel = "Citadel"
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.unciv.models.simulation
|
||||
|
||||
import com.unciv.Constants
|
||||
import com.unciv.logic.GameInfo
|
||||
import com.unciv.logic.GameStarter
|
||||
import com.unciv.models.ruleset.VictoryType
|
||||
@ -17,7 +18,7 @@ class Simulation(
|
||||
private val maxTurns: Int = 1000
|
||||
) {
|
||||
private val maxSimulations = threadsNumber * simulationsPerThread
|
||||
val civilizations = newGameInfo.civilizations.filter { it.civName != "Spectator" }.map { it.civName }
|
||||
val civilizations = newGameInfo.civilizations.filter { it.civName != Constants.spectator }.map { it.civName }
|
||||
private var startTime: Long = 0
|
||||
private var endTime: Long = 0
|
||||
var steps = ArrayList<SimulationStep>()
|
||||
|
@ -40,7 +40,7 @@ class MultiplayerScreen(previousScreen: BaseScreen) : PickerScreen() {
|
||||
|
||||
//Help Button Setup
|
||||
val tab = Table()
|
||||
val helpButton = "?".toTextButton()
|
||||
val helpButton = "Help".toTextButton()
|
||||
helpButton.onClick {
|
||||
val helpPopup = Popup(this)
|
||||
helpPopup.addGoodSizedLabel("To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID.").row()
|
||||
|
@ -134,7 +134,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
|
||||
} else {
|
||||
civGroup.add(ImageGetter.getRandomNationIndicator(30f))
|
||||
backgroundColor = Color.DARK_GRAY
|
||||
labelText = "???"
|
||||
labelText = Constants.unknownNationName
|
||||
}
|
||||
|
||||
civGroup.background = ImageGetter.getRoundedEdgeRectangle(backgroundColor)
|
||||
|
@ -2,6 +2,7 @@ package com.unciv.ui.overviewscreen
|
||||
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.Button
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.Table
|
||||
import com.unciv.Constants
|
||||
import com.unciv.UncivGame
|
||||
import com.unciv.logic.civilization.CivilizationInfo
|
||||
import com.unciv.logic.civilization.ReligionState
|
||||
@ -111,7 +112,7 @@ class ReligionOverviewTable(
|
||||
val foundingCivName =
|
||||
if (viewingPlayer.knows(religion.foundingCivName) || viewingPlayer.civName == religion.foundingCivName)
|
||||
religion.foundingCivName
|
||||
else "???"
|
||||
else Constants.unknownNationName
|
||||
statsTable.add(foundingCivName.toLabel()).right().pad(5f).row()
|
||||
if (religion.isMajorReligion()) {
|
||||
val holyCity = gameInfo.getCities().firstOrNull { it.religion.religionThisIsTheHolyCityOf == religion.name }
|
||||
@ -120,7 +121,7 @@ class ReligionOverviewTable(
|
||||
val cityName =
|
||||
if (viewingPlayer.exploredTiles.contains(holyCity.getCenterTile().position))
|
||||
holyCity.name
|
||||
else "???"
|
||||
else Constants.unknownNationName
|
||||
statsTable.add(cityName.toLabel()).right().pad(5f).row()
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.Table
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
|
||||
import com.badlogic.gdx.utils.Align
|
||||
import com.unciv.Constants
|
||||
import com.unciv.logic.civilization.CivilizationInfo
|
||||
import com.unciv.models.ruleset.Policy
|
||||
import com.unciv.models.ruleset.VictoryType
|
||||
@ -158,7 +159,7 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
|
||||
if (civ.isCurrentPlayer() || !civ.isMajorCiv()) continue
|
||||
val civName =
|
||||
if (playerCivInfo.diplomacy.containsKey(civ.civName)) civ.civName
|
||||
else "???"
|
||||
else Constants.unknownNationName
|
||||
table.add(getMilestone("Destroy [$civName]", civ.isDefeated())).row()
|
||||
}
|
||||
return table
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.unciv.app.desktop
|
||||
|
||||
import com.unciv.Constants
|
||||
import com.unciv.UncivGame
|
||||
import com.unciv.UncivGameParameters
|
||||
import com.unciv.logic.GameStarter
|
||||
@ -79,7 +80,7 @@ internal object ConsoleLauncher {
|
||||
})
|
||||
add(Player().apply {
|
||||
playerType = PlayerType.Human
|
||||
chosenCiv = "Spectator"
|
||||
chosenCiv = Constants.spectator
|
||||
})
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user