From 440959a014f4645d1d0154662d184eaea4bf014e Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Thu, 3 Aug 2023 16:35:43 -0700 Subject: [PATCH] enh: shorten date string if same day Signed-off-by: Christopher Ng --- apps/files_reminders/src/shared/utils.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts index 41b252a3910b4..358ca09aa25ab 100644 --- a/apps/files_reminders/src/shared/utils.ts +++ b/apps/files_reminders/src/shared/utils.ts @@ -89,17 +89,24 @@ export const getDateTime = (dateTime: DateTimePreset): Date => { } export const getDateString = (dueDate: Date): string => { - let localeOptions: Intl.DateTimeFormatOptions = { - weekday: 'short', + let formatOptions: Intl.DateTimeFormatOptions = { hour: 'numeric', minute: '2-digit', } - const today = moment() const dueDateMoment = moment(dueDate) + const today = moment() + + if (!dueDateMoment.isSame(today, 'date')) { + formatOptions = { + ...formatOptions, + weekday: 'short', + } + } + if (!dueDateMoment.isSame(today, 'week')) { - localeOptions = { - ...localeOptions, + formatOptions = { + ...formatOptions, month: 'short', day: 'numeric', } @@ -107,7 +114,7 @@ export const getDateString = (dueDate: Date): string => { return dueDate.toLocaleString( getCanonicalLocale(), - localeOptions, + formatOptions, ) }