From 8253109cf6f5afb5d524e17a8098e0bf904e24bb Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 21 Nov 2024 16:57:06 +0100 Subject: [PATCH] front: drop isUTC argument in dateTimeFormatting() This is unused and dangerous. Signed-off-by: Simon Ser --- front/src/applications/stdcm/utils/formatStdcmConf.ts | 4 ++-- front/src/utils/date.ts | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/front/src/applications/stdcm/utils/formatStdcmConf.ts b/front/src/applications/stdcm/utils/formatStdcmConf.ts index 4fbf6503fb3..ad6fd748fd4 100644 --- a/front/src/applications/stdcm/utils/formatStdcmConf.ts +++ b/front/src/applications/stdcm/utils/formatStdcmConf.ts @@ -126,8 +126,8 @@ export const checkStdcmConf = ( setFailure({ name: t('operationalStudies/manageTrainSchedule:errorMessages.trainScheduleTitle'), message: t('operationalStudies/manageTrainSchedule:errorMessages.originTimeOutsideWindow', { - low: dateTimeFormatting(searchDatetimeWindow.begin, false, false), - high: dateTimeFormatting(searchDatetimeWindow.end, false, false), + low: dateTimeFormatting(searchDatetimeWindow.begin, false), + high: dateTimeFormatting(searchDatetimeWindow.end, false), }), }) ); diff --git a/front/src/utils/date.ts b/front/src/utils/date.ts index 4aee17c966d..b2cb27c8528 100644 --- a/front/src/utils/date.ts +++ b/front/src/utils/date.ts @@ -47,11 +47,7 @@ export function formatIsoDate(date: Date) { return date.toISOString().substring(0, 10); } -export function dateTimeFormatting( - date: Date, - withoutTime: boolean = false, - isUTC: boolean = true -) { +export function dateTimeFormatting(date: Date, withoutTime: boolean = false) { let locale; switch (i18n.language) { case 'fr': @@ -60,10 +56,8 @@ export function dateTimeFormatting( default: locale = 'en'; } - // Force interpreting the date in UTC - const dateToUTC = dayjs(date).utc(isUTC); const dateFormat = withoutTime ? 'D MMM YYYY' : 'D MMM YYYY HH:mm'; - return dateToUTC.locale(locale).tz(userTimeZone).format(dateFormat).replace(/\./gi, ''); + return dayjs(date).locale(locale).tz(userTimeZone).format(dateFormat).replace(/\./gi, ''); } /**