diff --git a/backend/src/bot/handlers/views/trainings_day-trainings.tsx b/backend/src/bot/handlers/views/trainings_day-trainings.tsx index 000f5a7..2b5f0ca 100644 --- a/backend/src/bot/handlers/views/trainings_day-trainings.tsx +++ b/backend/src/bot/handlers/views/trainings_day-trainings.tsx @@ -4,7 +4,7 @@ import type { View } from '.' import views from '.' import type { Ctx } from '~/bot/context' import { TIMEZONE } from '~/constants' -import { getDateDayInTimezone, getDayBoundaries } from '~/utils/dates' +import { clockTime, getDateDayInTimezone, getDayBoundaries } from '~/utils/dates' const VIEW_ID = 'trainings/day-trainings' @@ -41,18 +41,8 @@ export default { {ctx.t['Views.DayTrainings.Message']} {trainings.map((training) => { - const timeStart = training.startsAt.toLocaleString('en-US', { - hour: '2-digit', - minute: '2-digit', - hour12: false, - timeZone: TIMEZONE, - }) - const timeEnd = training.endsAt.toLocaleString('en-US', { - hour: '2-digit', - minute: '2-digit', - hour12: false, - timeZone: TIMEZONE, - }) + const timeStart = clockTime(training.startsAt, TIMEZONE) + const timeEnd = clockTime(training.endsAt, TIMEZONE) const statusEmoji = training.checkedIn ? '🟢' : training.checkInAvailable diff --git a/backend/src/translations/_en.tsx b/backend/src/translations/_en.tsx index 873e757..2b23e65 100644 --- a/backend/src/translations/_en.tsx +++ b/backend/src/translations/_en.tsx @@ -52,7 +52,7 @@ export default { {title}

Date: {dateLong(startsAt)}
- Time: {clockTime(startsAt)}—{clockTime(endsAt)}
+ Time: {clockTime(startsAt, TIMEZONE)}—{clockTime(endsAt, TIMEZONE)}
Accreditted: {accredited ? 'Yes' : 'No'}
{(teachers.length > 0) && ( <> diff --git a/backend/src/utils/dates.ts b/backend/src/utils/dates.ts index cea7f8c..c528f40 100644 --- a/backend/src/utils/dates.ts +++ b/backend/src/utils/dates.ts @@ -81,10 +81,11 @@ export function getDayBoundaries({ return [boundaryStart, boundaryEnd] } -export function clockTime(date: Date): string { - return `${ - date.getHours().toString().padStart(2, '0') - }:${ - date.getMinutes().toString().padStart(2, '0') - }` +export function clockTime(date: Date, timezone?: string): string { + return date.toLocaleString('en-US', { + hour: '2-digit', + minute: '2-digit', + hour12: false, + timeZone: timezone, + }) }