mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-21 06:26:26 +00:00
Maurice
7ce31756a3
Settings > General > Language & region gets "Week starts on" (Monday, Sunday or Saturday), and Admin > User Defaults a default for everyone who has not picked one. Monday stays the built-in value, so nothing changes for anyone who leaves it alone. Both calendar implementations follow it: CustomDatePicker, used by trip dates, bookings, costs, to-dos and the admin school holidays on desktop and phone, and the journey date picker, whose weekday headers were hardcoded English and now speak the app language. The grid math and the header row live in one helper (utils/calendarWeek.ts). The day names on the options come from Intl, so only the label and a hint needed translating. Vacay keeps its own per-plan week start. The value is validated like the other regional settings: VALID_VALUES for admin defaults, the display-settings MCP tool, and the managed key list. Addresses discussion #2029.
48 lines
2.2 KiB
TypeScript
48 lines
2.2 KiB
TypeScript
// FE-UTIL-CALWEEK-001 to FE-UTIL-CALWEEK-005
|
|
import { describe, it, expect } from 'vitest'
|
|
import { leadingBlanks, weekdayLabels, weekStartDay, weekStartOptions } from './calendarWeek'
|
|
|
|
describe('calendarWeek (#2029)', () => {
|
|
it('FE-UTIL-CALWEEK-001: maps the setting to getDay() and falls back to Monday', () => {
|
|
expect(weekStartDay('monday')).toBe(1)
|
|
expect(weekStartDay('sunday')).toBe(0)
|
|
expect(weekStartDay('saturday')).toBe(6)
|
|
// Missing, unknown and the Vacay-style number all read as Monday, what every picker showed before.
|
|
expect(weekStartDay(undefined)).toBe(1)
|
|
expect(weekStartDay('friday')).toBe(1)
|
|
expect(weekStartDay(0)).toBe(1)
|
|
})
|
|
|
|
it('FE-UTIL-CALWEEK-002: counts the blanks before the 1st for each first weekday', () => {
|
|
// 1 March 2026 is a Sunday.
|
|
expect(leadingBlanks(2026, 2, 1)).toBe(6)
|
|
expect(leadingBlanks(2026, 2, 0)).toBe(0)
|
|
expect(leadingBlanks(2026, 2, 6)).toBe(1)
|
|
// 1 January 2024 is a Monday.
|
|
expect(leadingBlanks(2024, 0, 1)).toBe(0)
|
|
expect(leadingBlanks(2024, 0, 0)).toBe(1)
|
|
expect(leadingBlanks(2024, 0, 6)).toBe(2)
|
|
})
|
|
|
|
it('FE-UTIL-CALWEEK-003: rotates the header row to the first weekday', () => {
|
|
expect(weekdayLabels('en-US', 1, 'short')).toEqual(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'])
|
|
expect(weekdayLabels('en-US', 0, 'short')).toEqual(['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'])
|
|
expect(weekdayLabels('en-US', 6, 'short')).toEqual(['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri'])
|
|
expect(weekdayLabels('en-US', 0).join('')).toBe('SMTWTFS')
|
|
})
|
|
|
|
it('FE-UTIL-CALWEEK-004: speaks the app locale, not the browser one', () => {
|
|
expect(weekdayLabels('de-DE', 1, 'short')[0]).toBe('Mo')
|
|
})
|
|
|
|
it('FE-UTIL-CALWEEK-005: labels the choices with capitalised day names in the app language', () => {
|
|
expect(weekStartOptions('en-US')).toEqual([
|
|
{ value: 'monday', label: 'Monday' },
|
|
{ value: 'sunday', label: 'Sunday' },
|
|
{ value: 'saturday', label: 'Saturday' },
|
|
])
|
|
// French writes weekday names lower-case; standing alone on a button they start upper-case.
|
|
expect(weekStartOptions('fr-FR').map(o => o.label)).toEqual(['Lundi', 'Dimanche', 'Samedi'])
|
|
})
|
|
})
|