jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 01:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Translation logic tweaks (#7901)

Browse Source 
* Translation logic tweaks

* Comments
This commit is contained in:
Bram Kragten 2020-12-03 22:29:52 +01:00 committed by GitHub
parent 99eb15d15e
commit 4383f31696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/state/panel-title-mixin.ts
View File

@ -21,7 +21,8 @@ export const panelTitleMixin = <T extends Constructor<HassBaseEl>>(
if (
!oldHass ||
oldHass.panels !== this.hass.panels ||
oldHass.panelUrl !== this.hass.panelUrl
oldHass.panelUrl !== this.hass.panelUrl ||
oldHass.localize !== this.hass.localize
) {
setTitle(getPanelTitle(this.hass));
}

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

@ -36,6 +36,8 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
// eslint-disable-next-line: variable-name
private __coreProgress?: string;
private __loadedFragmetTranslations: Set<string> = new Set();
private __loadedTranslations: {
// track what things have been loaded
[category: string]: LoadedTranslationCategory;
@ -101,6 +103,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
document.querySelector("html")!.setAttribute("lang", hass.language);
this.style.direction = computeRTL(hass) ? "rtl" : "ltr";
this._loadCoreTranslations(hass.language);
this.__loadedFragmetTranslations = new Set();
this._loadFragmentTranslations(hass.language, hass.panelUrl);
}
@ -195,10 +198,31 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
language: string,
panelUrl: string
) {
if (translationMetadata.fragments.includes(panelUrl)) {
const result = await getTranslation(panelUrl, language);
this._updateResources(result.language, result.data);
if (!panelUrl) {
return;
}
const panelComponent = this.hass?.panels?.[panelUrl]?.component_name;
// If it's the first call we don't have panel info yet to check the component.
// If the url is not known it might be a custom lovelace dashboard, so we load lovelace translations
const fragment = translationMetadata.fragments.includes(
panelComponent || panelUrl
)
? panelComponent || panelUrl
: !panelComponent
? "lovelace"
: undefined;
if (!fragment) {
return;
}
if (this.__loadedFragmetTranslations.has(fragment)) {
return;
}
this.__loadedFragmetTranslations.add(fragment);
const result = await getTranslation(fragment, language);
this._updateResources(result.language, result.data);
}
private async _loadCoreTranslations(language: string) {
@ -227,6 +251,9 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
// from this._pendingHass instead. Otherwise the first set of strings is
// overwritten when we call _updateHass the second time!
// Allow hass to be updated
await new Promise((resolve) => setTimeout(resolve, 0));
if (language !== (this.hass ?? this._pendingHass).language) {
// the language was changed, abort
return;