From 6ef41bdf1c86c5c8ee333c79a818de7810535197 Mon Sep 17 00:00:00 2001 From: frost768 Date: Sun, 23 Apr 2023 20:01:12 +0300 Subject: [PATCH] language based time formatting --- src/setup/locales/en/translation.json | 2 +- src/setup/locales/fr/translation.json | 2 +- src/setup/locales/nl/translation.json | 2 +- src/video/components/actions/TimeAction.tsx | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/setup/locales/en/translation.json b/src/setup/locales/en/translation.json index fba37d84..d8b81da4 100644 --- a/src/setup/locales/en/translation.json +++ b/src/setup/locales/en/translation.json @@ -58,7 +58,7 @@ "backToHomeShort": "Back", "seasonAndEpisode": "S{{season}} E{{episode}}", "timeLeft": "{{timeLeft}} left", - "finishAt": "Finish at {{timeFinished}}", + "finishAt": "Finish at {{timeFinished, datetime}}", "buttons": { "episodes": "Episodes", "source": "Source", diff --git a/src/setup/locales/fr/translation.json b/src/setup/locales/fr/translation.json index fe9d73eb..505aa046 100644 --- a/src/setup/locales/fr/translation.json +++ b/src/setup/locales/fr/translation.json @@ -40,7 +40,7 @@ "backToHomeShort": "Retour", "seasonAndEpisode": "S{{season}} E{{episode}}", "timeLeft": "{{timeLeft}} restant", - "finishAt": "Terminer à {{timeFinished}}", + "finishAt": "Terminer à {{timeFinished, datetime}}", "buttons": { "episodes": "Épisodes", "source": "Source", diff --git a/src/setup/locales/nl/translation.json b/src/setup/locales/nl/translation.json index 94e796e8..23ecb618 100644 --- a/src/setup/locales/nl/translation.json +++ b/src/setup/locales/nl/translation.json @@ -58,7 +58,7 @@ "backToHomeShort": "Terug", "seasonAndEpisode": "S{{season}} A{{episode}}", "timeLeft": "Nog {{timeLeft}}", - "finishAt": "Afgelopen om {{timeFinished}}", + "finishAt": "Afgelopen om {{timeFinished, datetime}}", "buttons": { "episodes": "Afleveringen", "source": "Bron", diff --git a/src/video/components/actions/TimeAction.tsx b/src/video/components/actions/TimeAction.tsx index bab9e101..5767e039 100644 --- a/src/video/components/actions/TimeAction.tsx +++ b/src/video/components/actions/TimeAction.tsx @@ -61,13 +61,12 @@ export function TimeAction(props: Props) { const timeFinished = new Date( new Date().getTime() + (videoTime.duration * 1000) / mediaPlaying.playbackSpeed - ).toLocaleTimeString("en-US", { - hour: "numeric", - minute: "numeric", - hour12: true, - }); + ); const formattedTimeFinished = ` - ${t("videoPlayer.finishAt", { timeFinished, + formatParams: { + timeFinished: { hour: "numeric", minute: "numeric" }, + }, })}`; let formattedTime: string;