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

fix(lang): respect fallback languages

src/utils/lang.js

@@ -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,15 +54,16 @@ export async function activateLang(lang) {
 }
 
 export function initActivateLang() {
-  const lang = detect(
+  const languages = multipleDetect(
     fromUrl('lang'),
     fromStorage('lang'),
     fromNavigator(),
     PHANPY_DEFAULT_LANG,
     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?`);