Skip to content

Commit

Permalink
fix(core): fix default i18n calendar used, infer it from locale if po…
Browse files Browse the repository at this point in the history
…ssible (#9878)
slorber authored Feb 22, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 85d7424 commit 6bf21d2
Showing 2 changed files with 27 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/docusaurus/src/server/__tests__/i18n.test.ts
Original file line number Diff line number Diff line change
@@ -81,15 +81,15 @@ describe('defaultLocaleConfig', () => {
label: 'فارسی',
direction: 'rtl',
htmlLang: 'fa',
calendar: 'gregory',
calendar: 'persian',
path: 'fa',
});
expect(getDefaultLocaleConfig('fa-IR')).toEqual({
// cSpell:ignore ایران فارسیا
label: 'فارسی (ایران)',
direction: 'rtl',
htmlLang: 'fa-IR',
calendar: 'gregory',
calendar: 'persian',
path: 'fa-IR',
});
expect(getDefaultLocaleConfig('en-US-u-ca-buddhist')).toEqual({
27 changes: 25 additions & 2 deletions packages/docusaurus/src/server/i18n.ts
Original file line number Diff line number Diff line change
@@ -19,13 +19,36 @@ function getDefaultLocaleLabel(locale: string) {
);
}

function getDefaultCalendar(localeStr: string) {
const locale = new Intl.Locale(localeStr);

// If the locale name includes -u-ca-xxx the calendar will be defined
if (locale.calendar) {
return locale.calendar;
}

// Not well-supported but server code can infer a calendar from the locale
// See https://developer.mozilla.org/fr/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getCalendars
// See https://caniuse.com/mdn-javascript_builtins_intl_locale_getcalendars
const calendars =
// @ts-expect-error: new std method (Bun/JSC/WebKit)
locale.getCalendars?.() ??
// @ts-expect-error: non-std attribute (V8/Chromium/Node)
locale.calendars;

if (calendars instanceof Array && calendars[0]) {
return calendars[0];
}

return 'gregory';
}

export function getDefaultLocaleConfig(locale: string): I18nLocaleConfig {
return {
label: getDefaultLocaleLabel(locale),
direction: getLangDir(locale),
htmlLang: locale,
// If the locale name includes -u-ca-xxx the calendar will be defined
calendar: new Intl.Locale(locale).calendar ?? 'gregory',
calendar: getDefaultCalendar(locale),
path: locale,
};
}

0 comments on commit 6bf21d2

Please sign in to comment.