From 70cb0a8ed9ff5bc367c530b79186eaf7c9a3ce22 Mon Sep 17 00:00:00 2001 From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> Date: Mon, 16 Jan 2023 12:14:35 +0530 Subject: [PATCH] fix: Use account locale as the default locale on widget (#6248) * fix: Use account locale as the default locale on widget * Refactors check for invalid locale Co-authored-by: Muhsin Keloth --- app/javascript/packs/sdk.js | 3 ++- app/javascript/widget/App.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js index 13e41a98e..c5d98f65d 100755 --- a/app/javascript/packs/sdk.js +++ b/app/javascript/packs/sdk.js @@ -18,7 +18,8 @@ const runSDK = ({ baseUrl, websiteToken }) => { } const chatwootSettings = window.chatwootSettings || {}; - let locale = chatwootSettings.locale || 'en'; + let locale = chatwootSettings.locale; + if (chatwootSettings.useBrowserLanguage) { locale = window.navigator.language.replace('-', '_'); } diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue index 7210cf654..6b402c499 100755 --- a/app/javascript/widget/App.vue +++ b/app/javascript/widget/App.vue @@ -135,6 +135,7 @@ export default { }); }, setLocale(localeWithVariation) { + if (!localeWithVariation) return; const { enabledLanguages } = window.chatwootWebChannel; const localeWithoutVariation = localeWithVariation.split('_')[0]; const hasLocaleWithoutVariation = enabledLanguages.some(