mirror of
https://github.com/cupcakearmy/svelte-i18n.git
synced 2024-06-30 18:54:49 +02:00
fix: 🐛 fallback locale being looked twice
This commit is contained in:
parent
1ea650860c
commit
9260b83756
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
export async function preload() {
|
export async function preload() {
|
||||||
return setInitialLocale({
|
return setInitialLocale({
|
||||||
fallback: 'en-US',
|
fallback: 'en',
|
||||||
// navigator: true,
|
// navigator: true,
|
||||||
search: 'lang'
|
search: 'lang'
|
||||||
})
|
})
|
||||||
|
|
|
@ -25,7 +25,7 @@ export function isFallbackLocaleOf(localeA: string, localeB: string) {
|
||||||
export function getFallbackOf(locale: string) {
|
export function getFallbackOf(locale: string) {
|
||||||
const index = locale.lastIndexOf('-')
|
const index = locale.lastIndexOf('-')
|
||||||
if (index > 0) return locale.slice(0, index)
|
if (index > 0) return locale.slice(0, index)
|
||||||
if (fallback && !isFallbackLocaleOf(locale, fallback)) return fallback
|
if (fallback && !isFallbackLocaleOf(fallback, locale)) return fallback
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ export function getFallbacksOf(locale: string): string[] {
|
||||||
.split('-')
|
.split('-')
|
||||||
.map((_, i, arr) => arr.slice(0, i + 1).join('-'))
|
.map((_, i, arr) => arr.slice(0, i + 1).join('-'))
|
||||||
|
|
||||||
if (fallback != null && !isFallbackLocaleOf(locale, fallback)) {
|
if (fallback != null && !isFallbackLocaleOf(fallback, locale)) {
|
||||||
return locales.concat(getFallbacksOf(fallback))
|
return locales.concat(getFallbacksOf(fallback))
|
||||||
}
|
}
|
||||||
return locales
|
return locales
|
||||||
|
|
Loading…
Reference in New Issue
Block a user