jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-23 17:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make fallback translations work (#20596)

Browse Source
This commit is contained in:
Bram Kragten 2024-04-24 07:31:29 +02:00 committed by GitHub
parent 81922f5a3e
commit ffdd661b1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/state/translations-mixin.ts
View File

@ -70,7 +70,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
// eslint-disable-next-line: variable-name // eslint-disable-next-line: variable-name
private __coreProgress?: string; private __coreProgress?: string;
private __loadedFragmetTranslations: Set<string> = new Set(); private __loadedFragmentTranslations: Set<string> = new Set();
private __loadedTranslations: { private __loadedTranslations: {
// track what things have been loaded // track what things have been loaded
@ -260,7 +260,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
document.querySelector("html")!.setAttribute("lang", hass.language); document.querySelector("html")!.setAttribute("lang", hass.language);
this._applyDirection(hass); this._applyDirection(hass);
this._loadCoreTranslations(hass.language); this._loadCoreTranslations(hass.language);
this.__loadedFragmetTranslations = new Set(); this.__loadedFragmentTranslations = new Set();
this._loadFragmentTranslations(hass.language, hass.panelUrl); this._loadFragmentTranslations(hass.language, hass.panelUrl);
} }
@ -366,12 +366,12 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
return undefined; return undefined;
} }
if (this.__loadedFragmetTranslations.has(fragment)) { if (this.__loadedFragmentTranslations.has(fragment)) {
return this.hass!.localize; return this.hass!.localize;
} }
this.__loadedFragmetTranslations.add(fragment); this.__loadedFragmentTranslations.add(fragment);
const result = await getTranslation(fragment, language); const result = await getTranslation(fragment, language);
return this._updateResources(result.language, result.data); return this._updateResources(language, result.data);
} }
private async _loadCoreTranslations(language: string) { private async _loadCoreTranslations(language: string) {
@ -383,7 +383,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
this.__coreProgress = language; this.__coreProgress = language;
try { try {
const result = await getTranslation(null, language); const result = await getTranslation(null, language);
await this._updateResources(result.language, result.data); await this._updateResources(language, result.data);
} finally { } finally {
this.__coreProgress = undefined; this.__coreProgress = undefined;
} }