Fix i18n routing param (#9274)

* Fix i18n routing param * Add changeset
withastro · Dec 4, 2023 · feaba2c · feaba2c
1 parent d71e937
commit feaba2c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.changeset/smart-cats-camp.md b/.changeset/smart-cats-camp.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix routing prefixes when `prefixDefaultLocale` is `true`
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
@@ -10,7 +10,7 @@ type GetLocaleRelativeUrl = GetLocaleOptions & {
 	locales: Locales;
 	trailingSlash: AstroConfig['trailingSlash'];
 	format: AstroConfig['build']['format'];
-	routingStrategy?: 'prefix-always' | 'prefix-other-locales';
+	routing?: 'prefix-always' | 'prefix-other-locales';
 	defaultLocale: string;
 };
 
@@ -45,7 +45,7 @@ export function getLocaleRelativeUrl({
 	path,
 	prependWith,
 	normalizeLocale = true,
-	routingStrategy = 'prefix-other-locales',
+	routing = 'prefix-other-locales',
 	defaultLocale,
 }: GetLocaleRelativeUrl) {
 	const codeToUse = peekCodePathToUse(_locales, locale);
@@ -57,7 +57,7 @@ export function getLocaleRelativeUrl({
 	}
 	const pathsToJoin = [base, prependWith];
 	const normalizedLocale = normalizeLocale ? normalizeTheLocale(codeToUse) : codeToUse;
-	if (routingStrategy === 'prefix-always') {
+	if (routing === 'prefix-always') {
 		pathsToJoin.push(normalizedLocale);
 	} else if (locale !== defaultLocale) {
 		pathsToJoin.push(normalizedLocale);
@@ -88,7 +88,7 @@ type GetLocalesBaseUrl = GetLocaleOptions & {
 	locales: Locales;
 	trailingSlash: AstroConfig['trailingSlash'];
 	format: AstroConfig['build']['format'];
-	routingStrategy?: 'prefix-always' | 'prefix-other-locales';
+	routing?: 'prefix-always' | 'prefix-other-locales';
 	defaultLocale: string;
 };
 
@@ -100,15 +100,15 @@ export function getLocaleRelativeUrlList({
 	path,
 	prependWith,
 	normalizeLocale = false,
-	routingStrategy = 'prefix-other-locales',
+	routing = 'prefix-other-locales',
 	defaultLocale,
 }: GetLocalesBaseUrl) {
 	const locales = toPaths(_locales);
 	return locales.map((locale) => {
 		const pathsToJoin = [base, prependWith];
 		const normalizedLocale = normalizeLocale ? normalizeTheLocale(locale) : locale;
 
-		if (routingStrategy === 'prefix-always') {
+		if (routing === 'prefix-always') {
 			pathsToJoin.push(normalizedLocale);
 		} else if (locale !== defaultLocale) {
 			pathsToJoin.push(normalizedLocale);

diff --git a/packages/astro/test/units/i18n/astro_i18n.test.js b/packages/astro/test/units/i18n/astro_i18n.test.js
@@ -286,7 +286,7 @@ describe('getLocaleRelativeUrl', () => {
 				i18n: {
 					defaultLocale: 'en',
 					locales: ['en', 'es', 'en_US', 'en_AU'],
-					routingStrategy: 'prefix-always',
+					routing: 'prefix-always',
 				},
 			},
 		};
@@ -530,7 +530,7 @@ describe('getLocaleRelativeUrlList', () => {
 				i18n: {
 					defaultLocale: 'en',
 					locales: ['en', 'en_US', 'es'],
-					routingStrategy: 'prefix-always',
+					routing: 'prefix-always',
 				},
 			},
 		};
@@ -840,7 +840,7 @@ describe('getLocaleAbsoluteUrl', () => {
 				i18n: {
 					defaultLocale: 'en',
 					locales: ['en', 'es', 'en_US', 'en_AU'],
-					routingStrategy: 'prefix-always',
+					routing: 'prefix-always',
 				},
 			},
 		};
@@ -1122,7 +1122,7 @@ describe('getLocaleAbsoluteUrlList', () => {
 				i18n: {
 					defaultLocale: 'en',
 					locales: ['en', 'en_US', 'es'],
-					routingStrategy: 'prefix-always',
+					routing: 'prefix-always',
 				},
 			},
 		};