From b9309f689be7f55fde0a32a6e576784aa9fc1061 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 22 Mar 2018 12:39:16 -0230 Subject: Use extension api to get initial locale. --- app/scripts/lib/get-first-preferred-lang-code.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/scripts/lib/get-first-preferred-lang-code.js (limited to 'app/scripts/lib/get-first-preferred-lang-code.js') diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js new file mode 100644 index 000000000..74dfe246c --- /dev/null +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -0,0 +1,18 @@ +const fs = require('fs') +const path = require('path') +const extension = require('extensionizer') +const promisify = require('pify') + +const existingLocaleCodes = fs.readdirSync(path.join(__dirname, '..', '..', '_locales')) + +async function getFirstPreferredLangCode () { + const userPreferredLocaleCodes = await promisify( + extension.i18n.getAcceptLanguages, + { errorFirst: false } + )().catch(err => console.log('err123', err)) + const firstPreferredLangCode = userPreferredLocaleCodes.find(code => existingLocaleCodes.includes(code)) + // const firstPreferredLangCode = userPreferredLocaleCodes[0] + return firstPreferredLangCode || 'en' +} + +module.exports = getFirstPreferredLangCode -- cgit v1.2.3 From be2254b880c8c7bc17a139c3137dbe1e11c6060d Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Mar 2018 10:37:45 -0230 Subject: Remove comments and console.logs --- app/scripts/lib/get-first-preferred-lang-code.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/scripts/lib/get-first-preferred-lang-code.js') diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js index 74dfe246c..849018f26 100644 --- a/app/scripts/lib/get-first-preferred-lang-code.js +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -9,9 +9,8 @@ async function getFirstPreferredLangCode () { const userPreferredLocaleCodes = await promisify( extension.i18n.getAcceptLanguages, { errorFirst: false } - )().catch(err => console.log('err123', err)) + )() const firstPreferredLangCode = userPreferredLocaleCodes.find(code => existingLocaleCodes.includes(code)) - // const firstPreferredLangCode = userPreferredLocaleCodes[0] return firstPreferredLangCode || 'en' } -- cgit v1.2.3 From 165ae7d193ba2d5f29e0a6472bb26fa13efd1625 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 18:07:24 -0700 Subject: i18n - derrive locale codes from index --- app/scripts/lib/get-first-preferred-lang-code.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/scripts/lib/get-first-preferred-lang-code.js') diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js index 849018f26..28612f763 100644 --- a/app/scripts/lib/get-first-preferred-lang-code.js +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -1,9 +1,8 @@ -const fs = require('fs') -const path = require('path') const extension = require('extensionizer') const promisify = require('pify') +const allLocales = require('../../_locales/index.json') -const existingLocaleCodes = fs.readdirSync(path.join(__dirname, '..', '..', '_locales')) +const existingLocaleCodes = allLocales.map(locale => locale.code) async function getFirstPreferredLangCode () { const userPreferredLocaleCodes = await promisify( -- cgit v1.2.3 From 5aff114001d21696e7a7670db56b53cf3f36afa5 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 3 Apr 2018 20:34:28 -0230 Subject: Ensure get-first-preferred-lang-code.js matches locale codes from local directory names and chrome extension api. --- app/scripts/lib/get-first-preferred-lang-code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/scripts/lib/get-first-preferred-lang-code.js') diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js index 28612f763..25221ff98 100644 --- a/app/scripts/lib/get-first-preferred-lang-code.js +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -2,7 +2,7 @@ const extension = require('extensionizer') const promisify = require('pify') const allLocales = require('../../_locales/index.json') -const existingLocaleCodes = allLocales.map(locale => locale.code) +const existingLocaleCodes = allLocales.map(locale => locale.code.replace('_', '-')) async function getFirstPreferredLangCode () { const userPreferredLocaleCodes = await promisify( -- cgit v1.2.3 From 3c4b72bf2c5eab9c98531fcf7b0929a415b63f87 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 3 Apr 2018 20:52:17 -0230 Subject: Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-first-preferred-lang-code.js --- app/scripts/lib/get-first-preferred-lang-code.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/scripts/lib/get-first-preferred-lang-code.js') diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js index 25221ff98..e3635434e 100644 --- a/app/scripts/lib/get-first-preferred-lang-code.js +++ b/app/scripts/lib/get-first-preferred-lang-code.js @@ -2,14 +2,16 @@ const extension = require('extensionizer') const promisify = require('pify') const allLocales = require('../../_locales/index.json') -const existingLocaleCodes = allLocales.map(locale => locale.code.replace('_', '-')) +const existingLocaleCodes = allLocales.map(locale => locale.code.toLowerCase().replace('_', '-')) async function getFirstPreferredLangCode () { const userPreferredLocaleCodes = await promisify( extension.i18n.getAcceptLanguages, { 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' } -- cgit v1.2.3