imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extCounterpart now we only use one instance

Browse source
This commit is contained in:
David Baker 2017-05-25 12:08:14 +01:00
parent 9fa6e8b1e2
commit 913723b76b
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/languageHandler.js
View file

@ -37,7 +37,7 @@ export function _t(...args) {
return counterpart.translate(...args); return counterpart.translate(...args);
} }
export function setLanguage(languages, extCounterpart=null) { export function setLanguage(languages) {
if (!languages || !Array.isArray(languages)) { if (!languages || !Array.isArray(languages)) {
const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser()); const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
console.log("no language found. Got from browser: " + JSON.stringify(languages)); console.log("no language found. Got from browser: " + JSON.stringify(languages));
@ -81,9 +81,6 @@ export function setLanguage(languages, extCounterpart=null) {
}); });
return; return;
} else { } else {
if (extCounterpart) {
extCounterpart.registerTranslations(langCode, langJson);
}
counterpart.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]))) { if ((isValidFirstLanguage) || (languages.length==2 && languageFiles.hasOwnProperty(languages[1]))) {
validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1]; validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1];
getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations); getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations);
if (extCounterpart) {
extCounterpart.setLocale(validLanguageKey);
}
counterpart.setLocale(validLanguageKey); counterpart.setLocale(validLanguageKey);
UserSettingsStore.setLocalSetting('language', validLanguageKey); UserSettingsStore.setLocalSetting('language', validLanguageKey);
console.log("set language to "+validLanguageKey); console.log("set language to "+validLanguageKey);
@ -120,9 +114,6 @@ export function setLanguage(languages, extCounterpart=null) {
if (validLanguageKey!="en") { if (validLanguageKey!="en") {
getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations); getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations);
} }
if (extCounterpart) {
extCounterpart.setFallbackLocale('en');
}
counterpart.setFallbackLocale('en'); counterpart.setFallbackLocale('en');
}); });
}; };