Skip to content

Commit

Permalink
fix: does not redirect when the site is reload again (nuxt-modules#2263)
Browse files Browse the repository at this point in the history
  • Loading branch information
kazupon committed Jul 26, 2023
1 parent 424714f commit 7711f44
Show file tree
Hide file tree
Showing 8 changed files with 114 additions and 2 deletions.
7 changes: 7 additions & 0 deletions specs/fixtures/issues/2255/app.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<template>
<div>
<NuxtLayout>
<NuxtPage></NuxtPage>
</NuxtLayout>
</div>
</template>
12 changes: 12 additions & 0 deletions specs/fixtures/issues/2255/i18n.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export default defineI18nConfig(() => ({
legacy: false,
locale: 'en',
messages: {
en: {
welcome: 'Welcome'
},
fr: {
welcome: 'Bienvenue'
}
}
}))
5 changes: 5 additions & 0 deletions specs/fixtures/issues/2255/layouts/default.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<template>
<div>
<slot />
</div>
</template>
25 changes: 25 additions & 0 deletions specs/fixtures/issues/2255/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
devtools: { enabled: true },
modules: ['@nuxtjs/i18n'],
i18n: {
locales: [
{
code: 'en',
name: 'English'
},
{
code: 'fr',
name: 'Français'
}
],
strategy: 'prefix_except_default',
defaultLocale: 'en',
// debug: true,
detectBrowserLanguage: {
useCookie: true,
cookieKey: 'i18n_redirected',
redirectOn: 'root' // recommended
}
}
})
14 changes: 14 additions & 0 deletions specs/fixtures/issues/2255/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "nuxt3-test-issues-2255",
"private": true,
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview"
},
"devDependencies": {
"@nuxtjs/i18n": "latest",
"nuxt": "latest"
}
}
21 changes: 21 additions & 0 deletions specs/fixtures/issues/2255/pages/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<script setup>
const { locale, locales } = useI18n()
const switchLocalePath = useSwitchLocalePath()
const availableLocales = computed(() => {
return locales.value.filter(i => i.code !== locale.value)
})
</script>

<template>
<div>
<NuxtLink
:id="locale.code"
v-for="locale in availableLocales"
:key="locale.code"
:to="switchLocalePath(locale.code)"
>{{ locale.name }}</NuxtLink
>
</div>

<p id="msg">{{ $t('welcome') }}</p>
</template>
27 changes: 27 additions & 0 deletions specs/issues/2255.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { test, expect, describe } from 'vitest'
import { fileURLToPath } from 'node:url'
import { URL } from 'node:url'
import { setup, url, createPage } from '../utils'
import { getText } from '../helper'

describe('#2255', async () => {
await setup({
rootDir: fileURLToPath(new URL(`../fixtures/issues/2255`, import.meta.url))
})

test('redirect with browser language locale', async () => {
const home = url('/')
const page = await createPage(undefined, { locale: 'fr' })
await page.goto(home)

expect(await getText(page, '#msg')).toEqual('Bienvenue')
})

test('redirect with accept language header', async () => {
const home = url('/')
const page = await createPage(undefined, { extraHTTPHeaders: { 'Accept-Language': 'fr' } })
await page.goto(home)

expect(await getText(page, '#msg')).toEqual('Bienvenue')
})
})
5 changes: 3 additions & 2 deletions src/runtime/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,15 @@ export function getBrowserLocale(options: Required<NuxtI18nInternalOptions>, con
if (navigator.languages) {
// get browser language either from navigator if running on client side, or from the headers
ret = findBrowserLocale(options.__normalizedLocales, navigator.languages as string[])
__DEBUG__ && console.log('getBrowserLocale navigator.languages', navigator.languages)
__DEBUG__ && console.log('getBrowserLocale (navigator.languages, ret) -', navigator.languages, ret)
}
} else if (process.server) {
const header = useRequestHeaders(['accept-language'])
__DEBUG__ && console.log('getBrowserLocale accept-language', header)
const accept = header['accept-language']
if (accept) {
ret = findBrowserLocale(options.__normalizedLocales, parseAcceptLanguage(accept))
__DEBUG__ && console.log('getBrowserLocale ret', ret)
}
}

Expand Down Expand Up @@ -470,7 +471,7 @@ export function detectBrowserLanguage<Context extends NuxtApp = NuxtApp>(
return { locale: finalLocale, stat: true, from: localeFrom }
}

if (localeFrom === 'navigator_or_header' && finalLocale) {
if ((localeFrom === 'navigator_or_header' || localeFrom === 'cookie') && finalLocale) {
return { locale: finalLocale, stat: true, from: localeFrom }
}

Expand Down

0 comments on commit 7711f44

Please sign in to comment.