ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into fonts-update-romanian

This commit is contained in:
Lugiad 2024-12-07 18:50:07 +01:00 committed by GitHub
parent 42cb32f765 f2ef3620b5
commit e0a0d2377f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/timed-event-manager.ts
View File

@ -189,7 +189,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
const secs = Math.round(diff % 6e4 / 1e3); const secs = Math.round(diff % 6e4 / 1e3);
// Return formatted string // Return formatted string
return "Event Ends in : " + z(days) + "d " + z(hours) + "h " + z(mins) + "m " + z(secs) + "s"; return i18next.t("menu:eventTimer", { days: z(days), hours: z(hours), mins: z(mins), secs: z(secs) });
} }
updateCountdown() { updateCountdown() {

6
src/ui/login-form-ui-handler.ts
View File

@ -81,7 +81,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
} }
override getModalTitle(_config?: ModalConfig): string { override getModalTitle(_config?: ModalConfig): string {
return i18next.t("menu:login"); let key = "menu:login";
if (import.meta.env.VITE_SERVER_URL === "https://apibeta.pokerogue.net") {
key = "menu:loginBeta";
}
return i18next.t(key);
} }
override getWidth(_config?: ModalConfig): number { override getWidth(_config?: ModalConfig): number {