fix: prevent strategy no_prefix redirect detection locale change at…

…tempt (#2505)
nuxt-modules · Oct 19, 2023 · b4a5692 · b4a5692
1 parent 1fc1f02
commit b4a5692
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/specs/fixtures/basic/pages/category/[slug].vue b/specs/fixtures/basic/pages/category/[slug].vue
@@ -1,3 +1,4 @@
 <template>
   <p>This is cateory page on '{{ $route.params.slug }}'</p>
+  <NuxtLinkLocale id="return-home-link" to="/">Home</NuxtLinkLocale>
 </template>
diff --git a/specs/routing_strategies/no_prefix.spec.ts b/specs/routing_strategies/no_prefix.spec.ts
@@ -78,4 +78,24 @@ describe('strategy: no_prefix', async () => {
     // current locale
     expect(await getText(page, '#lang-switcher-current-locale code')).toEqual('fr')
   })
+
+  test('(#2493) should navigate from url with and without trailing slash', async () => {
+    const page = await createPage()
+    await page.goto(url('/category/nested/'))
+    await page.waitForURL('**/category/nested/')
+
+    await page.locator('#return-home-link').click()
+
+    await page.waitForURL(/:[0-9]+\/$/)
+
+    expect(page.url()).toEqual(url('/'))
+
+    await page.goto(url('/category/nested'))
+    await page.waitForURL('**/category/nested')
+
+    await page.locator('#return-home-link').click()
+    await page.waitForURL(/:[0-9]+\/$/)
+
+    expect(page.url()).toEqual(url('/'))
+  })
 })
diff --git a/src/runtime/plugins/i18n.ts b/src/runtime/plugins/i18n.ts
@@ -474,7 +474,7 @@ export default defineNuxtPlugin({
           route: { to, from },
           context: nuxtContext,
           targetLocale: locale,
-          routeLocaleGetter: getLocaleFromRoute,
+          routeLocaleGetter: nuxtI18nOptions.strategy === 'no_prefix' ? () => locale : getLocaleFromRoute,
           nuxtI18nOptions,
           calledWithRouting: true
         })