Skip to content
Snippets Groups Projects
Commit 3d2073c7 authored by Kocher, Manuel's avatar Kocher, Manuel
Browse files

Add all object namespaces to each i18n translation override instance

parent 7c9c9ec4
No related branches found
No related tags found
No related merge requests found
Pipeline #196319 passed
...@@ -183,7 +183,7 @@ export async function setOverridesByGlobalCache(i18n, element) { ...@@ -183,7 +183,7 @@ export async function setOverridesByGlobalCache(i18n, element) {
translationCache[lng] = await translationCache[lng]; translationCache[lng] = await translationCache[lng];
i18n.removeResourceBundle(lng, overrideNamespace); i18n.removeResourceBundle(lng, overrideNamespace);
if (translationCache[lng] === undefined || translationCache[lng][tagName] === undefined) continue; if (translationCache[lng] === undefined || translationCache[lng][tagName] === undefined) continue;
let resources = translationCache[lng][tagName]; let resources = translationCache[lng];
hasOverrides = true; hasOverrides = true;
i18n.addResourceBundle(lng, overrideNamespace, resources); i18n.addResourceBundle(lng, overrideNamespace, resources);
} catch(e) { } catch(e) {
......
...@@ -43,11 +43,6 @@ export class Translation extends DBPLitElement { ...@@ -43,11 +43,6 @@ export class Translation extends DBPLitElement {
// get overrides everytime // get overrides everytime
setOverridesByGlobalCache(this._i18n, this); setOverridesByGlobalCache(this._i18n, this);
// use translation overrides if path is given
//if(this.langDir != '') {
// setOverridesByGlobalCache(this._i18n, this);
//}
// supercall after default i18n init to override translations only // supercall after default i18n init to override translations only
// if a override with this tagname is given // if a override with this tagname is given
super.connectedCallback(); super.connectedCallback();
...@@ -55,11 +50,15 @@ export class Translation extends DBPLitElement { ...@@ -55,11 +50,15 @@ export class Translation extends DBPLitElement {
update(changedProperties) { update(changedProperties) {
let lang = this.lang; let lang = this.lang;
let tagName = ((this.dataset && this.dataset.tagName) || this.tagName).toLowerCase();
changedProperties.forEach((oldValue, propName) => { changedProperties.forEach((oldValue, propName) => {
switch (propName) { switch (propName) {
case 'lang': case 'lang':
this._i18n.changeLanguage(lang); this._i18n.changeLanguage(lang);
break; break;
case 'key':
this.key = tagName + "." + this.key;
break;
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment