From 913723b76bef38f8c91e57bb4aa49ba4f2bda57c Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 May 2017 12:08:14 +0100 Subject: [PATCH] Remove extCounterpart now we only use one instance --- src/languageHandler.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/languageHandler.js b/src/languageHandler.js index 25c380a53c..5e7c7869b4 100644 --- a/src/languageHandler.js +++ b/src/languageHandler.js @@ -37,7 +37,7 @@ export function _t(...args) { return counterpart.translate(...args); } -export function setLanguage(languages, extCounterpart=null) { +export function setLanguage(languages) { if (!languages || !Array.isArray(languages)) { const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser()); console.log("no language found. Got from browser: " + JSON.stringify(languages)); @@ -81,9 +81,6 @@ export function setLanguage(languages, extCounterpart=null) { }); return; } else { - if (extCounterpart) { - extCounterpart.registerTranslations(langCode, langJson); - } counterpart.registerTranslations(langCode, langJson); } } @@ -106,9 +103,6 @@ export function setLanguage(languages, extCounterpart=null) { if ((isValidFirstLanguage) || (languages.length==2 && languageFiles.hasOwnProperty(languages[1]))) { validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1]; getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations); - if (extCounterpart) { - extCounterpart.setLocale(validLanguageKey); - } counterpart.setLocale(validLanguageKey); UserSettingsStore.setLocalSetting('language', validLanguageKey); console.log("set language to "+validLanguageKey); @@ -120,9 +114,6 @@ export function setLanguage(languages, extCounterpart=null) { if (validLanguageKey!="en") { getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations); } - if (extCounterpart) { - extCounterpart.setFallbackLocale('en'); - } counterpart.setFallbackLocale('en'); }); };