From 4655ccd194862870d867cb4163e9fa94ed22d324 Mon Sep 17 00:00:00 2001 From: sylenien Date: Fri, 26 Aug 2022 11:40:12 +0200 Subject: [PATCH] change(ui): change timezone str output --- frontend/app/date.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/app/date.ts b/frontend/app/date.ts index 897c4db90..ef7443625 100644 --- a/frontend/app/date.ts +++ b/frontend/app/date.ts @@ -64,7 +64,7 @@ export const getDateFromMill = date => * @return {Boolean} */ export const isToday = (date: DateTime):boolean => date.hasSame(new Date(), 'day'); - +export const isSameYear = (date: DateTime):boolean => date.hasSame(new Date(), 'year'); export function formatDateTimeDefault(timestamp: number): string { const date = DateTime.fromMillis(timestamp); @@ -83,8 +83,17 @@ export function formatTimeOrDate(timestamp: number, timezone: Timezone): string if (timezone.value === 'UTC') date = date.toUTC(); date = date.setZone(timezone.value) } - - return isToday(date) ? date.toFormat('hh:mm a') : date.toFormat('LLL dd, yyyy, hh:mm a'); + if (isToday(date)) { + return date.toFormat('hh:mma').toLowerCase() + } + if (isSameYear(date)) { + const strHead = date.toFormat('LLL dd, ') + const strTail = date.toFormat('hh:mma').toLowerCase() + return strHead + strTail; + } + const strHead = date.toFormat('LLL dd, yyyy, ') + const strTail = date.toFormat('hh:mma').toLowerCase() + return strHead + strTail; } /**