Fix trailing slash (#34)

nojaf · florian-lefebvre · web-flow · commit b81d4edc818d · 2024-09-05T14:51:09.000+02:00
Co-authored-by: Florian Lefebvre &lt;contact@florian-lefebvre.dev&gt;
diff --git a/.changeset/grumpy-sloths-shout.md b/.changeset/grumpy-sloths-shout.md
@@ -0,0 +1,5 @@
+---
+"@astrolicious/i18n": patch
+---
+
+Fixes an issue where locales would not be properly loaded depending on Astro `trailingSlash` value
diff --git a/package/assets/middleware.ts b/package/assets/middleware.ts
@@ -11,7 +11,7 @@ const extractLocaleFromUrl = (pathname: string) => {
 		} else if (options.strategy === "prefixExceptDefault") {
 			if (
 				locale !== options.defaultLocale &&
-				pathname.startsWith(`/${locale}/`)
+				pathname.startsWith(`/${locale}`)
 			) {
 				return locale;
 			}
diff --git a/package/package.json b/package/package.json
@@ -38,10 +38,7 @@
 		"./components/I18nClient.astro": "./assets/components/I18nClient.astro",
 		"./components/I18nHead.astro": "./assets/components/I18nHead.astro"
 	},
-	"files": [
-		"dist",
-		"assets"
-	],
+	"files": ["dist", "assets"],
 	"scripts": {
 		"dev": "tsup --watch",
 		"build": "tsup"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const extractLocaleFromUrl = (pathname: string) => {`
`11`	`11`	`} else if (options.strategy === "prefixExceptDefault") {`
`12`	`12`	`if (`
`13`	`13`	`locale !== options.defaultLocale &&`
`14`		- pathname.startsWith(`/${locale}/`)
	`14`	+ pathname.startsWith(`/${locale}`)
`15`	`15`	`) {`
`16`	`16`	`return locale;`
`17`	`17`	`}`