RunicGateway/website
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge pull request 'fix(events): midnight in an announcement is 12:00 am on the Node we ship' (#200) from fix/events-announce-midnight-hourcycle into edge
All checks were successful
PR Checks / client-build (pull_request) Successful in 28s
Details
PR Checks / bot-tests (pull_request) Successful in 29s
Details
PR Checks / server-tests (pull_request) Successful in 13m32s
Details

Browse Source 
Reviewed-on: #200
Reviewed-by: Colby Whitlock <whitlocktech@gmail.com>
This commit is contained in:
Colby Whitlock
2026-09-10 00:27:58 +00:00
parent b92b85c3a9 7d7840eb6b
commit baa4f7d5ba
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/events/announce.js
View File

@@ -67,7 +67,18 @@ function startsAtLabel(at, zone) {
// Explicit rather than left to the locale, because `en-GB` would otherwise // Explicit rather than left to the locale, because `en-GB` would otherwise
// render midnight as "00:00" while the schedule editor beside it writes // render midnight as "00:00" while the schedule editor beside it writes
// "12:00 AM" — one event, two spellings of the same instant. // "12:00 AM" — one event, two spellings of the same instant.
hour12: true, //
// `hourCycle: 'h12'` and NOT `hour12: true`, which is not the same request
// and does not survive a Node upgrade. For a locale whose default cycle is
// h23 — `en-GB` is one — Node 20 resolves `hour12: true` to **h11**, whose
// hours run 0–11, so midnight comes out "0:00 am"; Node 22 and later
// resolve it to h12 and it comes out "12:00 am". Same ICU on both, so this
// is V8's ECMA-402 behaviour and not locale data, and the image ships
// node:20-alpine while a dev machine is newer — which is how this rendered
// correctly in front of everyone who wrote it and wrongly for every real
// recipient. `recurrence.js` states the mirror-image rule for `h23`; there
// is no `hour12` left in this repo and it should stay that way.
hourCycle: 'h12',
}).format(when) }).format(when)
return `${text} (${zone || 'UTC'})` return `${text} (${zone || 'UTC'})`
} catch { } catch {

8
server/test/eventAnnounce.test.js
View File

@@ -260,9 +260,15 @@ test('the start time is written out in the SHARD\'s zone, not the server\'s', ()
}) })
test('midnight reads as 12:00 am and never as 00:00', () => { test('midnight reads as 12:00 am and never as 00:00', () => {
// `hour12` is set explicitly. Left to the en-GB locale this would render // The hour cycle is set explicitly. Left to the en-GB locale this would render
// "00:00" while the schedule editor beside it writes "12:00 AM" — one event, // "00:00" while the schedule editor beside it writes "12:00 AM" — one event,
// two spellings of the same instant. // two spellings of the same instant.
//
// This assertion only has teeth on the Node the image ships (20), where
// `hour12: true` resolves to h11 and midnight reads "0:00 am". On Node 22+ it
// passes either way — so a green run on a dev machine is not evidence, and CI
// is what actually holds this line. See the note beside `hourCycle` in
// events/announce.js.
assert.match(announce.startsAtLabel(new Date('2026-09-13T04:00:00Z'), 'America/New_York'), /12:00 am/) assert.match(announce.startsAtLabel(new Date('2026-09-13T04:00:00Z'), 'America/New_York'), /12:00 am/)
}) })