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

Fix race condition in translation loading (#7597)

Browse Source
This commit is contained in:
Adam Ernst 2020-11-05 11:47:09 -06:00 committed by GitHub
parent 9a3a7c28f4
commit 461b86a04b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,9 +221,15 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
// loaded resources. This merges the new data on top of the old data for // loaded resources. This merges the new data on top of the old data for
// this language, so that the full translation set can be loaded across // this language, so that the full translation set can be loaded across
// multiple fragments. // multiple fragments.
//
// Beware of a subtle race condition: it is possible to get here twice
// before this.hass is even created. In this case our base state comes
// from this._pendingHass instead. Otherwise the first set of strings is
// overwritten when we call _updateHass the second time!
const baseHass = this.hass ?? this._pendingHass;
const resources = { const resources = {
[language]: { [language]: {
...this.hass?.resources?.[language], ...baseHass?.resources?.[language],
...data, ...data,
}, },
}; };