mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-11-03 14:41:38 +08:00 
			
		
		
		
	feat: 🎸 improve journal name pattern
This commit is contained in:
		
							parent
							
								
									6ea3d5fb17
								
							
						
					
					
						commit
						7cbdacc9b0
					
				@ -50,7 +50,7 @@ const baseReplacements = {
 | 
				
			|||||||
    quarter: ['quarterNumber', 'shortQuarter'],
 | 
					    quarter: ['quarterNumber', 'shortQuarter'],
 | 
				
			||||||
    month: ['isoMonth', 'monthNumber', 'monthNumberPadded', 'month', 'shortMonth3', 'shortMonth4'],
 | 
					    month: ['isoMonth', 'monthNumber', 'monthNumberPadded', 'month', 'shortMonth3', 'shortMonth4'],
 | 
				
			||||||
    week: ['weekNumber', 'weekNumberPadded', 'shortWeek', 'shortWeek3'],
 | 
					    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[] {
 | 
					function getTimeUnitReplacements(timeUnit: TimeUnit): string[] {
 | 
				
			||||||
@ -65,7 +65,7 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs
 | 
				
			|||||||
        quarter: rootNote.getOwnedLabelValue("quarterPattern") || t('quarterNumber'),
 | 
					        quarter: rootNote.getOwnedLabelValue("quarterPattern") || t('quarterNumber'),
 | 
				
			||||||
        month: rootNote.getOwnedLabelValue("monthPattern") || "{monthNumberPadded} - {month}",
 | 
					        month: rootNote.getOwnedLabelValue("monthPattern") || "{monthNumberPadded} - {month}",
 | 
				
			||||||
        week: rootNote.getOwnedLabelValue("weekPattern") || t('weekdayNumber'),
 | 
					        week: rootNote.getOwnedLabelValue("weekPattern") || t('weekdayNumber'),
 | 
				
			||||||
        day: rootNote.getOwnedLabelValue("datePattern") || "{dayInMonthPadded} - {weekDay}"
 | 
					        day: rootNote.getOwnedLabelValue("datePattern") || "{dateNumberPadded} - {weekDay}"
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const pattern = patterns[timeUnit];
 | 
					    const pattern = patterns[timeUnit];
 | 
				
			||||||
@ -76,10 +76,9 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs
 | 
				
			|||||||
    const allReplacements: Record<string, string> = {
 | 
					    const allReplacements: Record<string, string> = {
 | 
				
			||||||
        // Common date formats
 | 
					        // Common date formats
 | 
				
			||||||
        '{year}': dateObj.format('YYYY'),
 | 
					        '{year}': dateObj.format('YYYY'),
 | 
				
			||||||
        '{isoDate}': dateObj.format('YYYY-MM-DD'),
 | 
					 | 
				
			||||||
        '{isoMonth}': dateObj.format('YYYY-MM'),
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Month related
 | 
					        // Month related
 | 
				
			||||||
 | 
					        '{isoMonth}': dateObj.format('YYYY-MM'),
 | 
				
			||||||
        '{monthNumber}': numberStr,
 | 
					        '{monthNumber}': numberStr,
 | 
				
			||||||
        '{monthNumberPadded}': numberStr.padStart(2, '0'),
 | 
					        '{monthNumberPadded}': numberStr.padStart(2, '0'),
 | 
				
			||||||
        '{month}': monthName,
 | 
					        '{month}': monthName,
 | 
				
			||||||
@ -97,7 +96,9 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs
 | 
				
			|||||||
        '{shortWeek3}': `W${numberStr.padStart(2, '0')}`,
 | 
					        '{shortWeek3}': `W${numberStr.padStart(2, '0')}`,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Day related
 | 
					        // Day related
 | 
				
			||||||
        '{dayInMonthPadded}': numberStr.padStart(2, '0'),
 | 
					        '{isoDate}': dateObj.format('YYYY-MM-DD'),
 | 
				
			||||||
 | 
					        '{dateNumber}': numberStr,
 | 
				
			||||||
 | 
					        '{dateNumberPadded}': numberStr.padStart(2, '0'),
 | 
				
			||||||
        '{ordinal}': dateObj.format('Do'),
 | 
					        '{ordinal}': dateObj.format('Do'),
 | 
				
			||||||
        '{weekDay}': weekDay,
 | 
					        '{weekDay}': weekDay,
 | 
				
			||||||
        '{weekDay3}': weekDay.substring(0, 3),
 | 
					        '{weekDay3}': weekDay.substring(0, 3),
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user