From 97437261cbf693fd7e769f0cb07f19e5c27af321 Mon Sep 17 00:00:00 2001 From: Devon Govett Date: Mon, 13 Jun 2022 12:14:07 -0700 Subject: [PATCH] Work around Safari bug with ethiopic calendar --- packages/@internationalized/date/src/DateFormatter.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/@internationalized/date/src/DateFormatter.ts b/packages/@internationalized/date/src/DateFormatter.ts index 2e56d1d2a80..0cf3a0658f7 100644 --- a/packages/@internationalized/date/src/DateFormatter.ts +++ b/packages/@internationalized/date/src/DateFormatter.ts @@ -89,6 +89,12 @@ export class DateFormatter implements Intl.DateTimeFormat { resolvedOptions.hour12 = this.resolvedHourCycle === 'h11' || this.resolvedHourCycle === 'h12'; } + // Safari uses a different name for the Ethiopic (Amete Alem) calendar. + // https://bugs.webkit.org/show_bug.cgi?id=241564 + if (resolvedOptions.calendar === 'ethiopic-amete-alem') { + resolvedOptions.calendar = 'ethioaa'; + } + return resolvedOptions; } }