enh: shorten date string if same day

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Aug 9, 2023 · 440959a · 440959a
1 parent c2dfc42
commit 440959a
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts
@@ -89,25 +89,32 @@ 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',
 		}
 	}
 
 	return dueDate.toLocaleString(
 		getCanonicalLocale(),
-		localeOptions,
+		formatOptions,
 	)
 }