Commitd8d4b9b

authored

feat: display quiet hours using 24-hour time format (#17016)

1 parent38b21ab commitd8d4b9bCopy full SHA for d8d4b9b

File tree

+33

-9

lines changed

+33

-9

lines changed

Lines changed: 32 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,38 @@ describe("util/schedule", () => {`
`78`	`78`	`});`
`79`	`79`
`80`	`80`	`describe("quietHoursDisplay",()=>{`
`81`		`-constquietHoursStart=quietHoursDisplay(`
`82`		`-"00:00",`
`83`		`-"Australia/Sydney",`
`84`		`-newDate("2023-09-06T15:00:00.000+10:00"),`
`85`		`-);`
	`81`	`+it("midnight",()=>{`
	`82`	`+constquietHoursStart=quietHoursDisplay(`
	`83`	`+"00:00",`
	`84`	`+"Australia/Sydney",`
	`85`	`+newDate("2023-09-06T15:00:00.000+10:00"),`
	`86`	`+);`
	`87`	`+`
	`88`	`+expect(quietHoursStart).toBe(`
	`89`	`+"00:00 tomorrow (in 9 hours) in Australia/Sydney",`
	`90`	`+);`
	`91`	`+});`
	`92`	`+it("five o'clock today",()=>{`
	`93`	`+constquietHoursStart=quietHoursDisplay(`
	`94`	`+"17:00",`
	`95`	`+"Europe/London",`
	`96`	`+newDate("2023-09-06T15:00:00.000+10:00"),`
	`97`	`+);`
`86`	`98`
`87`		`-expect(quietHoursStart).toBe(`
`88`		`-"12:00AM tomorrow (in 9 hours) in Australia/Sydney",`
`89`		`-);`
	`99`	`+expect(quietHoursStart).toBe(`
	`100`	`+"17:00 today (in 11 hours) in Europe/London",`
	`101`	`+);`
	`102`	`+});`
	`103`	`+it("lunch tomorrow",()=>{`
	`104`	`+constquietHoursStart=quietHoursDisplay(`
	`105`	`+"13:00",`
	`106`	`+"US/Central",`
	`107`	`+newDate("2023-09-06T08:00:00.000+10:00"),`
	`108`	`+);`
	`109`	`+`
	`110`	`+expect(quietHoursStart).toBe(`
	`111`	`+"13:00 tomorrow (in 20 hours) in US/Central",`
	`112`	`+);`
	`113`	`+});`
`90`	`114`	`});`
`91`	`115`	`});`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ export const quietHoursDisplay = (`
`276`	`276`
`277`	`277`	`consttoday=dayjs(now).tz(tz);`
`278`	`278`	`constday=dayjs(parsed.next().toDate()).tz(tz);`
`279`		`-letdisplay=day.format("h:mmA");`
	`279`	`+letdisplay=day.format("HH:mm");`
`280`	`280`
`281`	`281`	`if(day.isSame(today,"day")){`
`282`	`282`	`display+=" today";`

Comments

(0)