diff --git a/web/src/utils/dateUtil.ts b/web/src/utils/dateUtil.ts index c86232983..c45bc79a4 100644 --- a/web/src/utils/dateUtil.ts +++ b/web/src/utils/dateUtil.ts @@ -56,7 +56,7 @@ export const formatUnixTimestampToDateTime = (unixTimestamp: number, config: Dat // use strftime_fmt if defined in config file if (strftime_fmt) { - const strftime_locale = strftime.timezone(getTimezoneOffset(timezone)).localizeByIdentifier(locale); + const strftime_locale = strftime.timezone(getTimezoneOffset(date, timezone)).localizeByIdentifier(locale); return strftime_locale(strftime_fmt, date); } @@ -121,10 +121,11 @@ export const getDurationFromTimestamps = (start_time: number, end_time: number | * @param timezone string representation of the timezone the user is requesting * @returns number of minutes offset from UTC */ -const getTimezoneOffset = (timezone: string): number => { - const date = new Date(); - let iso = date.toLocaleString('en-us', { timeZone: timezone, hour12: false }).replace(', ', 'T'); - iso += '.' + date.getMilliseconds().toString().padStart(3, '0'); - const lie = new Date(iso + 'Z'); - return -(lie.getMilliseconds() - date.getMilliseconds()) / 60 / 1000; +const getTimezoneOffset = (date: Date, timezone: string): number => { + const utcDate = new Date(date.getMilliseconds() - (date.getTimezoneOffset() * 60 * 1000)); + // locale of en-CA is required for proper locale format + let iso = utcDate.toLocaleString('en-CA', { timeZone: timezone, hour12: false }).replace(', ', 'T'); + iso += '.' + utcDate.getMilliseconds().toString().padStart(3, '0'); + const target = new Date(iso + 'Z'); + return (target.getTime() - utcDate.getTime()) / 60 / 1000; }