diff options
author | PhyrexTsai <x01ep23i@hotmail.com> | 2018-07-04 09:06:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-04 09:06:10 +0800 |
commit | f38dc03b27a457733315cbb16d59d0ea339505da (patch) | |
tree | 77cfdf13c0e83c8e6d87099bfedddc3d58667de1 /app/scripts/lib/get-first-preferred-lang-code.js | |
parent | 11736e6318182ab5b43430410a46059e5f46ad52 (diff) | |
parent | 13b03ec090df70512d43e0d6acbe6bf60040a892 (diff) | |
download | tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.gz tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.zst tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.zip |
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
Diffstat (limited to 'app/scripts/lib/get-first-preferred-lang-code.js')
-rw-r--r-- | app/scripts/lib/get-first-preferred-lang-code.js | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js index 1e6a83ba6..170d508c1 100644 --- a/app/scripts/lib/get-first-preferred-lang-code.js +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -2,8 +2,7 @@ const extension = require('extensionizer') const promisify = require('pify') const allLocales = require('../../_locales/index.json') -const isSupported = extension.i18n && extension.i18n.getAcceptLanguages -const getPreferredLocales = isSupported ? promisify( +const getPreferredLocales = extension.i18n ? promisify( extension.i18n.getAcceptLanguages, { errorFirst: false } ) : async () => [] @@ -18,7 +17,21 @@ const existingLocaleCodes = allLocales.map(locale => locale.code.toLowerCase().r * */ async function getFirstPreferredLangCode () { - const userPreferredLocaleCodes = await getPreferredLocales() + let userPreferredLocaleCodes + + try { + userPreferredLocaleCodes = await getPreferredLocales() + } catch (e) { + // Brave currently throws when calling getAcceptLanguages, so this handles that. + userPreferredLocaleCodes = [] + } + + // safeguard for Brave Browser until they implement chrome.i18n.getAcceptLanguages + // https://github.com/MetaMask/metamask-extension/issues/4270 + if (!userPreferredLocaleCodes) { + userPreferredLocaleCodes = [] + } + const firstPreferredLangCode = userPreferredLocaleCodes .map(code => code.toLowerCase()) .find(code => existingLocaleCodes.includes(code)) @@ -26,3 +39,4 @@ async function getFirstPreferredLangCode () { } module.exports = getFirstPreferredLangCode + |