Skip to content

chore: cherry-pick commits for v3.10.1 patch release #11982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slorber merged 1 commit into from
Apr 30, 2026
Merged

chore: cherry-pick commits for v3.10.1 patch release #11982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/docusaurus/src/server/__tests__/i18n.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ describe('loadI18n', () => {
defaultLocale: 'fr',
locales: ['en', 'fr', 'de'],
localeConfigs: {
fr: {label: 'Français', translate: false},
fr: {label: 'Français', translate: false, htmlLang: 'fr-FR'},
en: {translate: true, baseUrl: 'en-EN/whatever/else'},
de: {translate: false, baseUrl: '/de-DE/'},
},
Expand All @@ -295,7 +295,7 @@ describe('loadI18n', () => {
fr: {
label: 'Français',
direction: 'ltr',
htmlLang: 'fr',
htmlLang: 'fr-FR',
calendar: 'gregory',
path: 'fr',
translate: false,
Expand Down Expand Up @@ -458,7 +458,7 @@ describe('loadI18n', () => {
direction: 'ltr',
htmlLang: 'en-US',
label: 'American English',
path: 'en-US',
path: 'x1',
translate: false,
url: 'https://example.com',
});
Expand Down
16 changes: 11 additions & 5 deletions packages/docusaurus/src/server/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,20 @@ function getDefaultDirection(localeStr: string) {
}

export function getDefaultLocaleConfig(
// Locale "key/identifier"
// Can be anything, but usually a country / BCP47 code
locale: string,
// optionally provided in i18n.localConfigs, need to respect BCP47
htmlLang?: string,
): Omit<I18nLocaleConfig, 'translate' | 'url' | 'baseUrl'> {
try {
return {
label: getDefaultLocaleLabel(locale),
direction: getDefaultDirection(locale),
htmlLang: locale,
calendar: getDefaultCalendar(locale),
label: getDefaultLocaleLabel(htmlLang ?? locale),
direction: getDefaultDirection(htmlLang ?? locale),
htmlLang: htmlLang ?? locale,
calendar: getDefaultCalendar(htmlLang ?? locale),
// Fot the i18n/<path>, we don't use htmlLang on purpose
// see bug https://github.com/facebook/docusaurus/issues/11952
path: locale,
};
} catch (e) {
Expand Down Expand Up @@ -152,7 +158,7 @@ export async function loadI18n({
I18nLocaleConfig,
'translate' | 'url' | 'baseUrl'
> = {
...getDefaultLocaleConfig(localeConfigInput.htmlLang ?? locale),
...getDefaultLocaleConfig(locale, localeConfigInput.htmlLang),
...localeConfigInput,
};

Expand Down
Loading