|
1 |
| -import { deepCopy, isFunction, isArray, isObject, isString } from '@intlify/shared' |
| 1 | +import { deepCopy, isFunction } from '@intlify/shared' |
2 | 2 | import { createLogger } from 'virtual:nuxt-i18n-logger'
|
3 | 3 |
|
4 | 4 | import type { I18nOptions, Locale, FallbackLocale, LocaleMessages, DefineLocaleMessage } from 'vue-i18n'
|
@@ -35,19 +35,23 @@ export async function loadVueI18nOptions(
|
35 | 35 | }
|
36 | 36 |
|
37 | 37 | export function makeFallbackLocaleCodes(fallback: FallbackLocale, locales: Locale[]): Locale[] {
|
| 38 | + if (fallback === false) return [] |
| 39 | + if (Array.isArray(fallback)) return fallback |
| 40 | + |
38 | 41 | let fallbackLocales: Locale[] = []
|
39 |
| - if (isArray(fallback)) { |
40 |
| - fallbackLocales = fallback |
41 |
| - } else if (isObject(fallback)) { |
42 |
| - const targets = [...locales, 'default'] |
43 |
| - for (const locale of targets) { |
44 |
| - if (fallback[locale]) { |
45 |
| - fallbackLocales = [...fallbackLocales, ...fallback[locale].filter(Boolean)] |
46 |
| - } |
| 42 | + if (typeof fallback === 'string') { |
| 43 | + if (locales.every(locale => locale !== fallback)) { |
| 44 | + fallbackLocales.push(fallback) |
47 | 45 | }
|
48 |
| - } else if (isString(fallback) && locales.every(locale => locale !== fallback)) { |
49 |
| - fallbackLocales.push(fallback) |
| 46 | + return fallbackLocales |
50 | 47 | }
|
| 48 | + |
| 49 | + const targets = [...locales, 'default'] |
| 50 | + for (const locale of targets) { |
| 51 | + if (locale in fallback == false) continue |
| 52 | + fallbackLocales = [...fallbackLocales, ...fallback[locale].filter(Boolean)] |
| 53 | + } |
| 54 | + |
51 | 55 | return fallbackLocales
|
52 | 56 | }
|
53 | 57 |
|
|
0 commit comments