From 7d831a8cf51ddfe6952c7116897aecf0c0747c66 Mon Sep 17 00:00:00 2001 From: Hugo Zigha Date: Tue, 16 Jan 2024 14:50:41 +0100 Subject: [PATCH] MT#59145 When Chrome browser is set to Czech language the CSC throws a Javascript error Change-Id: I94ac23bc438a323ebfcab0203ee11264a911ccc8 (cherry picked from commit d81072765930e069cd87f906c3656de1c1d7057b) --- src/i18n/index.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/i18n/index.js b/src/i18n/index.js index e324d0f6..10300a83 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -7,8 +7,6 @@ import { i18n } from 'boot/i18n' import { setSession } from 'src/storage' import { Quasar } from 'quasar' -export const defaultLocale = 'en-US' - export default function messages () { return { 'en-US': patchKeysForFallback(localeEn), @@ -18,7 +16,8 @@ export default function messages () { it: patchKeysForFallback(localeIt) } } -const loadedLanguages = [defaultLocale] + +const loadedLanguages = ['en-US'] async function loadLanguageAsync (lang) { if (i18n.locale !== lang && !loadedLanguages.includes(lang)) { const language = lang === 'en-US' ? 'en' : lang @@ -89,10 +88,10 @@ export function getCurrentLangAsV1Format () { } export function normalizeLocaleCode (locale) { - const shortLangCode = String(locale || defaultLocale).substr(0, 2).toLowerCase() + const shortLangCode = String(locale || 'en-US').substring(0, 2).toLowerCase() const langCodeInV2Format = (shortLangCode === 'en') ? 'en-US' : shortLangCode const langCode = Object.keys(messages()).filter(l => l === langCodeInV2Format)[0] - return langCode || defaultLocale + return langCode || 'en-US' } export function getLangFromBrowserDefaults () {