From c43062e9a653fe93aed8759ff5258f776a918f3d Mon Sep 17 00:00:00 2001 From: nojaf Date: Thu, 5 Sep 2024 10:16:07 +0200 Subject: [PATCH 1/3] fix: don't require trailing slash to detect locale --- package/assets/middleware.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/assets/middleware.ts b/package/assets/middleware.ts index 780ef72..2d83668 100644 --- a/package/assets/middleware.ts +++ b/package/assets/middleware.ts @@ -3,15 +3,15 @@ import { i18nextConfig, options, routes } from "virtual:astro-i18n/internal"; import { defineMiddleware } from "astro/middleware"; const extractLocaleFromUrl = (pathname: string) => { - for (const locale of options.locales) { + for (const locale of options.locales) { if (options.strategy === "prefix") { - if (pathname.startsWith(`/${locale}/`)) { + if (pathname.startsWith(`/${locale}/`)) { return locale; } } else if (options.strategy === "prefixExceptDefault") { if ( locale !== options.defaultLocale && - pathname.startsWith(`/${locale}/`) + pathname.startsWith(`/${locale}`) ) { return locale; } From fee2348894eb74431637134697d5620904bb7976 Mon Sep 17 00:00:00 2001 From: nojaf Date: Thu, 5 Sep 2024 10:18:03 +0200 Subject: [PATCH 2/3] mend --- package/assets/middleware.ts | 4 ++-- package/package.json | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/assets/middleware.ts b/package/assets/middleware.ts index 2d83668..fb9b9aa 100644 --- a/package/assets/middleware.ts +++ b/package/assets/middleware.ts @@ -3,9 +3,9 @@ import { i18nextConfig, options, routes } from "virtual:astro-i18n/internal"; import { defineMiddleware } from "astro/middleware"; const extractLocaleFromUrl = (pathname: string) => { - for (const locale of options.locales) { + for (const locale of options.locales) { if (options.strategy === "prefix") { - if (pathname.startsWith(`/${locale}/`)) { + if (pathname.startsWith(`/${locale}/`)) { return locale; } } else if (options.strategy === "prefixExceptDefault") { diff --git a/package/package.json b/package/package.json index ea42ac8..250b70d 100644 --- 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" From f66565293d772933dd11d64aa58834c796ba3c85 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 5 Sep 2024 14:47:52 +0200 Subject: [PATCH 3/3] chore: changeset --- .changeset/grumpy-sloths-shout.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/grumpy-sloths-shout.md diff --git a/.changeset/grumpy-sloths-shout.md b/.changeset/grumpy-sloths-shout.md new file mode 100644 index 0000000..7b8dc41 --- /dev/null +++ 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