m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix locale codes contains underscore will never be preferred (#6116)

Browse Source
This commit is contained in:
S.C. Chen 2019-02-09 03:36:37 +08:00 committed by Whymarrh Whitby
parent 57d458233b
commit 1a4203a8c6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/lib/get-first-preferred-lang-code.js
View File

@ -7,7 +7,13 @@ const getPreferredLocales = extension.i18n ? promisify(
{ errorFirst: false } { errorFirst: false }
) : async () => [] ) : async () => []
const existingLocaleCodes = allLocales.map(locale => locale.code.toLowerCase().replace('_', '-')) // mapping some browsers return hyphen instead underscore in locale codes (e.g. zh_TW -> zh-tw)
const existingLocaleCodes = {}
allLocales.forEach(locale => {
if (locale && locale.code) {
existingLocaleCodes[locale.code.toLowerCase().replace('_', '-')] = locale.code
}
})
/** /**
* Returns a preferred language code, based on settings within the user's browser. If we have no translations for the * Returns a preferred language code, based on settings within the user's browser. If we have no translations for the
@ -33,9 +39,10 @@ async function getFirstPreferredLangCode () {
} }
const firstPreferredLangCode = userPreferredLocaleCodes const firstPreferredLangCode = userPreferredLocaleCodes
.map(code => code.toLowerCase()) .map(code => code.toLowerCase().replace('_', '-'))
.find(code => existingLocaleCodes.includes(code)) .find(code => existingLocaleCodes.hasOwnProperty(code))
return firstPreferredLangCode || 'en'
return existingLocaleCodes[firstPreferredLangCode] || 'en'
} }
module.exports = getFirstPreferredLangCode module.exports = getFirstPreferredLangCode