Merge branch 'main' into aside-code

withastro · Jul 10, 2024 · 4455f1f · 4455f1f
2 parents 7000d14 + 359a642
commit 4455f1f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.changeset/large-bananas-beg.md b/.changeset/large-bananas-beg.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/starlight': patch
+---
+
+Fixes an i18n configuration issue for multilingual sites when using Astro’s `i18n` config with `prefixDefaultLocale` set to `false`.
diff --git a/docs/src/content/docs/resources/community-content.mdx b/docs/src/content/docs/resources/community-content.mdx
@@ -84,6 +84,11 @@ Explore community-produced content maintained by Starlight users:
 		title="Adding Structured Data to Starlight Pages"
 		description="Learn how to build dynamic JSON-LD structured data for your documentation pages."
 	/>
+	<LinkCard
+		href="https://starlight-examples.netlify.app/"
+		title="Starlight Examples"
+		description="A collection of StackBlitz embeds demonstrating practical ways of doing stuff in Starlight documentation sites."
+	/>
 </CardGrid>
 
 ## Video Content

diff --git a/packages/starlight/__tests__/basics/i18n.test.ts b/packages/starlight/__tests__/basics/i18n.test.ts
@@ -162,7 +162,7 @@ describe('processI18nConfig', () => {
 					locales: ['en', { codes: ['fr'], path: 'french' }],
 				},
 				expected: {
-					defaultLocale: { label: 'English', lang: 'en', dir: 'ltr', locale: 'en' },
+					defaultLocale: { label: 'English', lang: 'en', dir: 'ltr', locale: undefined },
 					locales: {
 						root: { label: 'English', lang: 'en', dir: 'ltr' },
 						french: { label: 'Français', lang: 'fr', dir: 'ltr' },
@@ -180,7 +180,7 @@ describe('processI18nConfig', () => {
 					routing: { prefixDefaultLocale: false },
 				},
 				expected: {
-					defaultLocale: { label: 'فارسی', lang: 'fa', dir: 'rtl', locale: 'fa' },
+					defaultLocale: { label: 'فارسی', lang: 'fa', dir: 'rtl', locale: undefined },
 					locales: {
 						root: { label: 'فارسی', lang: 'fa', dir: 'rtl' },
 						de: { label: 'Deutsch', lang: 'de', dir: 'ltr' },

diff --git a/packages/starlight/utils/i18n.ts b/packages/starlight/utils/i18n.ts
@@ -118,11 +118,12 @@ function getStarlightI18nConfig(
 		locales,
 		defaultLocale: {
 			...inferStarlightLocaleFromAstroLocale(defaultAstroLocale),
-			locale: isMonolingualWithRootLocale
-				? undefined
-				: isAstroLocaleExtendedConfig(defaultAstroLocale)
-					? defaultAstroLocale.codes[0]
-					: defaultAstroLocale,
+			locale:
+				isMonolingualWithRootLocale || (isMultilingual && !prefixDefaultLocale)
+					? undefined
+					: isAstroLocaleExtendedConfig(defaultAstroLocale)
+						? defaultAstroLocale.codes[0]
+						: defaultAstroLocale,
 		},
 	};
 }