mirrors/phanpy
1
0
Fork 0
mirror of https://github.com/cheeaun/phanpy.git synced 2024-11-21 16:55:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #938 from sorin-davidoi/lang-respect-fallbacks

Browse source 
fix(lang): respect fallback languages
This commit is contained in:
Chee Aun 2024-11-19 09:21:20 +08:00 committed by GitHub
commit 2e83df6f25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/utils/lang.js
View file

@ -1,9 +1,9 @@
import { i18n } from '@lingui/core';
import {
detect,
fromNavigator,
fromStorage,
fromUrl,
multipleDetect,
} from '@lingui/detect-locale';
import Locale from 'intl-locale-textinfo-polyfill';
@ -54,7 +54,7 @@ export async function activateLang(lang) {
}
export function initActivateLang() {
const lang = detect(
const languages = multipleDetect(
fromUrl('lang'),
fromStorage('lang'),
fromNavigator(),
@ -62,7 +62,8 @@ export function initActivateLang() {
DEFAULT_LANG,
);
const matchedLang =
ALL_LOCALES.find((l) => l === lang) || localeMatch(lang, ALL_LOCALES);
languages.find((l) => ALL_LOCALES.includes(l)) ||
localeMatch(languages, ALL_LOCALES);
activateLang(matchedLang);
// const yes = confirm(t`Reload to apply language setting?`);