diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts index 86182ba5106..07142888e51 100644 --- a/apps/files_reminders/src/shared/utils.ts +++ b/apps/files_reminders/src/shared/utils.ts @@ -120,19 +120,36 @@ export const getDateString = (dueDate: Date): string => { } } - return dueDate.toLocaleString( - getCanonicalLocale(), - formatOptions, - ) -} - -export const getVerboseDateString = (dueDate: Date): string => { - const formatOptions: Intl.DateTimeFormatOptions = { - weekday: 'long', - hour: 'numeric', - minute: '2-digit', - month: 'long', - day: 'numeric', + if (!dueDateMoment.isSame(today, 'year')) { + formatOptions = { + ...formatOptions, + year: 'numeric', + } + } + + return dueDate.toLocaleString( + getCanonicalLocale(), + formatOptions, + ) +} + +export const getVerboseDateString = (dueDate: Date): string => { + let formatOptions: Intl.DateTimeFormatOptions = { + month: 'long', + day: 'numeric', + weekday: 'long', + hour: 'numeric', + minute: '2-digit', + } + + const dueDateMoment = moment(dueDate) + const today = moment() + + if (!dueDateMoment.isSame(today, 'year')) { + formatOptions = { + ...formatOptions, + year: 'numeric', + } } return dueDate.toLocaleString(