Skip to content

Commit d8d4b9b

Browse files
authored
feat: display quiet hours using 24-hour time format (coder#17016)
Fixes: coder#15452
1 parent 38b21ab commit d8d4b9b

File tree

2 files changed

+33
-9
lines changed

2 files changed

+33
-9
lines changed

site/src/utils/schedule.test.ts

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,38 @@ describe("util/schedule", () => {
7878
});
7979

8080
describe("quietHoursDisplay", () => {
81-
const quietHoursStart = quietHoursDisplay(
82-
"00:00",
83-
"Australia/Sydney",
84-
new Date("2023-09-06T15:00:00.000+10:00"),
85-
);
81+
it("midnight", () => {
82+
const quietHoursStart = quietHoursDisplay(
83+
"00:00",
84+
"Australia/Sydney",
85+
new Date("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+
const quietHoursStart = quietHoursDisplay(
94+
"17:00",
95+
"Europe/London",
96+
new Date("2023-09-06T15:00:00.000+10:00"),
97+
);
8698

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+
const quietHoursStart = quietHoursDisplay(
105+
"13:00",
106+
"US/Central",
107+
new Date("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+
});
90114
});
91115
});

site/src/utils/schedule.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ export const quietHoursDisplay = (
276276

277277
const today = dayjs(now).tz(tz);
278278
const day = dayjs(parsed.next().toDate()).tz(tz);
279-
let display = day.format("h:mmA");
279+
let display = day.format("HH:mm");
280280

281281
if (day.isSame(today, "day")) {
282282
display += " today";

0 commit comments

Comments
 (0)