fix(docs): Fixed a problem with i18n.

Skyost · Dec 1, 2024 · e85b9e0 · e85b9e0
1 parent c6fef31
commit e85b9e0
Show file tree

Hide file tree

Showing 9 changed files with 5,949 additions and 7,387 deletions.
diff --git a/docs/app.vue b/docs/app.vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
-if (import.meta.client) {
-  onMounted(() => {
-    const i18n = useI18n()
-    const browserLocale = i18n.getBrowserLocale()
-    const locales = i18n.locales
-    const locale = locales.value.find(({ code }) => code === browserLocale)
-    if (locale) {
-      i18n.setLocale(locale.code)
-    }
-  })
-}
+import availableLocales from '~/i18n/availableLocales'
+
+onMounted(async () => {
+  const i18n = useI18n()
+  const browserLocale = i18n.getBrowserLocale()
+  const locales = i18n.locales
+  const locale = locales.value.find(({ code }) => code === browserLocale)
+  if (locale && locale != availableLocales[0]) {
+    await i18n.setLocale(availableLocales[0].code)
+    await i18n.setLocale(locale.code)
+  }
+})
 </script>
 
 <template>

diff --git a/docs/locales/availableLocales.ts → docs/i18n/availableLocales.ts b/docs/locales/availableLocales.ts → docs/i18n/availableLocales.ts
@@ -2,11 +2,11 @@ export default [
   {
     code: 'en',
     file: 'en.ts',
-    iso: 'en-US',
+    languages: 'en-US',
   },
   {
     code: 'fr',
     file: 'fr.ts',
-    iso: 'fr-FR',
+    languages: 'fr-FR',
   },
 ]
diff --git a/docs/i18n/i18n.config.ts b/docs/i18n/i18n.config.ts
@@ -0,0 +1,8 @@
+export default defineI18nConfig(() => {
+  return {
+    legacy: false,
+    locale: 'en',
+    fallbackLocale: 'en',
+    ssr: true,
+  }
+})
diff --git a/docs/locales/en.ts → docs/i18n/locales/en.ts b/docs/locales/en.ts → docs/i18n/locales/en.ts
diff --git a/docs/locales/fr.ts → docs/i18n/locales/fr.ts b/docs/locales/fr.ts → docs/i18n/locales/fr.ts
diff --git a/docs/layouts/default.vue b/docs/layouts/default.vue
@@ -1,9 +1,5 @@
 <script setup lang="ts">
-const i18nHead = useLocaleHead({
-  addSeoAttributes: {
-    canonicalQueries: ['foo'],
-  },
-})
+const i18nHead = useLocaleHead()
 useHead({
   htmlAttrs: {
     lang: i18nHead.value.htmlAttrs!.lang,

diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts
@@ -2,11 +2,20 @@ import StylelintPlugin from 'vite-plugin-stylelint'
 import eslintPlugin from '@nabla/vite-plugin-eslint'
 
 import { siteMeta } from './site'
-import availableLocales from './locales/availableLocales'
+import availableLocales from './i18n/availableLocales'
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  compatibilityDate: '2024-07-01',
+  modules: [
+    '@nuxt/eslint',
+    'nuxt-cname-generator',
+    '@nuxtjs/i18n',
+    '@nuxt/icon',
+    'nuxt-link-checker',
+    '@nuxtjs/sitemap',
+    '@nuxtjs/robots',
+    '@bootstrap-vue-next/nuxt',
+  ],
   devtools: { enabled: true },
 
   app: {
@@ -24,33 +33,13 @@ export default defineNuxtConfig({
     '~/assets/app.scss',
   ],
 
-  i18n: {
-    baseUrl: siteMeta.url,
-    locales: availableLocales,
-    langDir: 'locales',
-    defaultLocale: 'en',
-    strategy: 'no_prefix',
-    compilation: {
-      escapeHtml: false,
-      strictMessage: false,
-    },
-    detectBrowserLanguage: {
-      useCookie: true,
-      cookieKey: 'language',
-      redirectOn: 'root',
-    },
+  site: {
+    url: siteMeta.url,
+    name: siteMeta.name,
+    trailingSlash: true,
   },
 
-  modules: [
-    '@nuxt/eslint',
-    'nuxt-cname-generator',
-    '@nuxtjs/i18n',
-    '@nuxt/icon',
-    'nuxt-link-checker',
-    '@nuxtjs/sitemap',
-    '@nuxtjs/robots',
-    '@bootstrap-vue-next/nuxt',
-  ],
+  compatibilityDate: '2024-07-01',
 
   nitro: {
     prerender: {
@@ -65,12 +54,6 @@ export default defineNuxtConfig({
     ],
   },
 
-  site: {
-    url: siteMeta.url,
-    name: siteMeta.name,
-    trailingSlash: true,
-  },
-
   cname: {
     host: siteMeta.url,
   },
@@ -80,4 +63,30 @@ export default defineNuxtConfig({
       stylistic: true,
     },
   },
+
+  i18n: {
+    vueI18n: 'i18n.config.ts',
+    baseUrl: siteMeta.url,
+    locales: availableLocales,
+    langDir: 'locales',
+    defaultLocale: 'en',
+    strategy: 'no_prefix',
+    compilation: {
+      escapeHtml: false,
+      strictMessage: false,
+    },
+    detectBrowserLanguage: {
+      useCookie: true,
+      cookieKey: 'language',
+      redirectOn: 'root',
+    },
+  },
+
+  linkChecker: {
+    failOnError: false,
+    skipInspections: [
+      'link-text',
+      'no-uppercase-chars',
+    ],
+  },
 })