From 7cbdacc9b0e5ac6f05f50b7235c62cca1d5d0cb2 Mon Sep 17 00:00:00 2001 From: Jin <22962980+JYC333@users.noreply.github.com> Date: Thu, 3 Apr 2025 00:21:14 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20improve=20journal=20name?= =?UTF-8?q?=20pattern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/date_notes.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/services/date_notes.ts b/src/services/date_notes.ts index fc088b5ea..ad4c81135 100644 --- a/src/services/date_notes.ts +++ b/src/services/date_notes.ts @@ -50,7 +50,7 @@ const baseReplacements = { quarter: ['quarterNumber', 'shortQuarter'], month: ['isoMonth', 'monthNumber', 'monthNumberPadded', 'month', 'shortMonth3', 'shortMonth4'], week: ['weekNumber', 'weekNumberPadded', 'shortWeek', 'shortWeek3'], - day: ['isoDate', 'dayInMonthPadded', 'ordinal', 'weekDay', 'weekDay3', 'weekDay2'] + day: ['isoDate', 'dateNumber', 'dateNumberPadded', 'ordinal', 'weekDay', 'weekDay3', 'weekDay2'] }; function getTimeUnitReplacements(timeUnit: TimeUnit): string[] { @@ -65,7 +65,7 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs quarter: rootNote.getOwnedLabelValue("quarterPattern") || t('quarterNumber'), month: rootNote.getOwnedLabelValue("monthPattern") || "{monthNumberPadded} - {month}", week: rootNote.getOwnedLabelValue("weekPattern") || t('weekdayNumber'), - day: rootNote.getOwnedLabelValue("datePattern") || "{dayInMonthPadded} - {weekDay}" + day: rootNote.getOwnedLabelValue("datePattern") || "{dateNumberPadded} - {weekDay}" }; const pattern = patterns[timeUnit]; @@ -76,10 +76,9 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs const allReplacements: Record = { // Common date formats '{year}': dateObj.format('YYYY'), - '{isoDate}': dateObj.format('YYYY-MM-DD'), - '{isoMonth}': dateObj.format('YYYY-MM'), // Month related + '{isoMonth}': dateObj.format('YYYY-MM'), '{monthNumber}': numberStr, '{monthNumberPadded}': numberStr.padStart(2, '0'), '{month}': monthName, @@ -97,7 +96,9 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs '{shortWeek3}': `W${numberStr.padStart(2, '0')}`, // Day related - '{dayInMonthPadded}': numberStr.padStart(2, '0'), + '{isoDate}': dateObj.format('YYYY-MM-DD'), + '{dateNumber}': numberStr, + '{dateNumberPadded}': numberStr.padStart(2, '0'), '{ordinal}': dateObj.format('Do'), '{weekDay}': weekDay, '{weekDay3}': weekDay.substring(0, 3),