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

Made rich presence text not change with language (#5613)

Browse Source 
* update for no reason

* bruuhhhhhhhhh

* bruuhhhhhhhhh

* rebase... this probably wont work

* bruuhhhhhhhhh

* fix comments..?

* bruuhhhhhhhhh

* equalize with upstream/master

* made the game not change the text shown in rich presence with the current language, added a language override functionality to String.tr() which is probably inefficient as hell, also the reason why i had to keep the .tr in leader name is because it showed the parantheses

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* revert changes to .tr(), use what @yairm210 suggested
This commit is contained in:
logic 2021-11-02 18:24:37 +03:00 committed by GitHub
parent 15a2a51a99
commit f53435e612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/Italian.properties
View File

@ -5231,3 +5231,4 @@ Once active, the game's year display will use mayan notation. = Quando attivato,
The Maya measured time in days from what we would call 11th of August, 3114 BCE. A day is called K'in, 20 days are a Winal, 18 Winals are a Tun, 20 Tuns are a K'atun, 20 K'atuns are a B'ak'tun, 20 B'ak'tuns a Piktun, and so on. = I Maya misuravano il tempo in giorni da quello che chiameremmo l'11 agosto 3114 a.C. Un giorno si chiama K'in, 20 giorni un Winal, 18 Winal un Tun, 20 Tun un K'atun, 20 K'atun un B'ak'tun, 20 B'ak'tun un Piktun e via discorrendo. The Maya measured time in days from what we would call 11th of August, 3114 BCE. A day is called K'in, 20 days are a Winal, 18 Winals are a Tun, 20 Tuns are a K'atun, 20 K'atuns are a B'ak'tun, 20 B'ak'tuns a Piktun, and so on. = I Maya misuravano il tempo in giorni da quello che chiameremmo l'11 agosto 3114 a.C. Un giorno si chiama K'in, 20 giorni un Winal, 18 Winal un Tun, 20 Tun un K'atun, 20 K'atun un B'ak'tun, 20 B'ak'tun un Piktun e via discorrendo.
Unciv only displays ය B'ak'tuns, ඹ K'atuns and ම Tuns (from left to right) since that is enough to approximate gregorian calendar years. The Maya numerals are pretty obvious to understand. Have fun deciphering them! = Unciv visualizza solo ය B'ak'tun, ඹ K'atun e ම Tun (da sinistra a destra) in quanto sufficienti per approssimare gli anni del calendario gregoriano. Se vuoi puoi provare a decifrare i numeri maya: non sembrano difficili da decrifrare. Unciv only displays ය B'ak'tuns, ඹ K'atuns and ම Tuns (from left to right) since that is enough to approximate gregorian calendar years. The Maya numerals are pretty obvious to understand. Have fun deciphering them! = Unciv visualizza solo ය B'ak'tun, ඹ K'atun e ම Tun (da sinistra a destra) in quanto sufficienti per approssimare gli anni del calendario gregoriano. Se vuoi puoi provare a decifrare i numeri maya: non sembrano difficili da decrifrare.

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

@ -259,6 +259,7 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
val nation = worldScreen.gameInfo.ruleSet.nations[worldScreen.selectedCiv.civName]!! val nation = worldScreen.gameInfo.ruleSet.nations[worldScreen.selectedCiv.civName]!!
val selectedCivIcon = ImageGetter.getNationIndicator(nation, 35f) val selectedCivIcon = ImageGetter.getNationIndicator(nation, 35f)
selectedCivIconHolder.actor = selectedCivIcon selectedCivIconHolder.actor = selectedCivIcon
selectedCivIconHolder.onClick { worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv)) }
} }
private fun getCultureText(civInfo: CivilizationInfo, nextTurnStats: Stats): String { private fun getCultureText(civInfo: CivilizationInfo, nextTurnStats: Stats): String {

4
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -85,9 +85,9 @@ internal object DesktopLauncher {
if (!game.isInitialized) return if (!game.isInitialized) return
val presence = DiscordRichPresence() val presence = DiscordRichPresence()
val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization() val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization()
presence.details = currentPlayerCiv.nation.getLeaderDisplayName().tr() presence.details = "${currentPlayerCiv.nation.leaderName} of ${currentPlayerCiv.nation.name}"
presence.largeImageKey = "logo" // The actual image is uploaded to the discord app / applications webpage presence.largeImageKey = "logo" // The actual image is uploaded to the discord app / applications webpage
presence.largeImageText = "Turn".tr() + " " + currentPlayerCiv.gameInfo.turns presence.largeImageText = "Turn" + " " + currentPlayerCiv.gameInfo.turns
DiscordRPC.INSTANCE.Discord_UpdatePresence(presence) DiscordRPC.INSTANCE.Discord_UpdatePresence(presence)
} }
} }