From 6eae02de259eeba1077abd67d571e32040811dcc Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 14:51:57 +0800 Subject: [PATCH 1/3] Give URL language priority over user's language, fallback to 'en' --- src/common/elevio.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/common/elevio.js b/src/common/elevio.js index 726eaeb596..122e6119b1 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -2,19 +2,22 @@ import { generateLiveApiInstance } from './appId'; // import { getLanguage } from '../common/lang'; import { getTokenList } from './utils/storageManager'; import { translate } from '../common/i18n'; +import { getLanguage } from './lang'; const Elevio = (() => { const init = () => { if (!window._elev) return; // eslint-disable-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { - // const availableElevLanguages = ['es', 'id', 'pt', 'ru']; - // const currentLanguage = getLanguage().toLowerCase(); - // if (availableElevLanguages.indexOf(currentLanguage) !== -1) { - // window._elev.setLanguage(currentLanguage); // eslint-disable-line no-underscore-dangle - // } - // eslint-disable-next-line no-underscore-dangle - window._elev.setSettings({ + const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] + const currentLanguage = getLanguage(); + if (availableLanguages.includes(currentLanguage)) { + elev.setLanguage(currentLanguage); + } else { + elev.setLanguage('en'); + } + + elev.setSettings({ page_url: `${document.location.protocol}//${document.location.hostname}${document.location.pathname}`, }); setUserInfo(elev); From 38bbe2c9a28060887c1c95b9f5b7029df32d34f7 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 15:00:04 +0800 Subject: [PATCH 2/3] Override default homepage for Elev.io --- src/common/elevio.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/elevio.js b/src/common/elevio.js index 122e6119b1..6c96a94229 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -7,6 +7,10 @@ import { getLanguage } from './lang'; const Elevio = (() => { const init = () => { if (!window._elev) return; // eslint-disable-line no-underscore-dangle + + // eslint-disable-next-line no-underscore-dangle + window._elev.on('widget:opened', () => window._elev.openArticle('43')); + // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] From 179758129c7f0cc2d4bde70e51ef72b63b246a13 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 17:52:05 +0800 Subject: [PATCH 3/3] Enable all languages --- src/common/elevio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/elevio.js b/src/common/elevio.js index 6c96a94229..5e5c8e2db2 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -13,7 +13,7 @@ const Elevio = (() => { // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { - const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] + const availableLanguages = ['en', 'es', 'id', 'pt', 'ru']; const currentLanguage = getLanguage(); if (availableLanguages.includes(currentLanguage)) { elev.setLanguage(currentLanguage);