Merge pull request #3857 from MetaMask/match-local-localecodes

Ensure get-first-preferred-lang-code.js matches locale codes from loc…
feature/default_network_editable
kumavis 7 years ago committed by GitHub
commit 79932b7e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      app/scripts/lib/get-first-preferred-lang-code.js

@ -2,14 +2,16 @@ const extension = require('extensionizer')
const promisify = require('pify') const promisify = require('pify')
const allLocales = require('../../_locales/index.json') const allLocales = require('../../_locales/index.json')
const existingLocaleCodes = allLocales.map(locale => locale.code) const existingLocaleCodes = allLocales.map(locale => locale.code.toLowerCase().replace('_', '-'))
async function getFirstPreferredLangCode () { async function getFirstPreferredLangCode () {
const userPreferredLocaleCodes = await promisify( const userPreferredLocaleCodes = await promisify(
extension.i18n.getAcceptLanguages, extension.i18n.getAcceptLanguages,
{ errorFirst: false } { errorFirst: false }
)() )()
const firstPreferredLangCode = userPreferredLocaleCodes.find(code => existingLocaleCodes.includes(code)) const firstPreferredLangCode = userPreferredLocaleCodes
.map(code => code.toLowerCase())
.find(code => existingLocaleCodes.includes(code))
return firstPreferredLangCode || 'en' return firstPreferredLangCode || 'en'
} }

Loading…
Cancel
Save