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

Don't expose translation methods on window (#1194)

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-05-19 16:12:26 -04:00 committed by GitHub
parent 4de7cbec30
commit 0789c0884c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entrypoints/app.js
View File

@ -22,7 +22,7 @@ import '../managers/notification-manager.js';
import '../resources/ha-style.js'; import '../resources/ha-style.js';
import '../resources/html-import/polyfill.js'; import '../resources/html-import/polyfill.js';
import '../util/ha-pref-storage.js'; import '../util/ha-pref-storage.js';
import '../util/hass-translation.js'; import { getActiveTranslation, getTranslation } from '../util/hass-translation.js';
import '../util/legacy-support'; import '../util/legacy-support';
import '../util/roboto.js'; import '../util/roboto.js';
import hassCallApi from '../util/hass-call-api.js'; import hassCallApi from '../util/hass-call-api.js';
@ -108,7 +108,7 @@ class HomeAssistant extends PolymerElement {
} }
loadResources(fragment) { loadResources(fragment) {
window.getTranslation(fragment).then((result) => { getTranslation(fragment).then((result) => {
this._updateResources(result.language, result.data); this._updateResources(result.language, result.data);
}); });
} }
@ -167,7 +167,7 @@ class HomeAssistant extends PolymerElement {
themes: null, themes: null,
panelUrl: this.panelUrl, panelUrl: this.panelUrl,
language: window.getActiveTranslation(), language: getActiveTranslation(),
// If resources are already loaded, don't discard them // If resources are already loaded, don't discard them
resources: (this.hass && this.hass.resources) || null, resources: (this.hass && this.hass.resources) || null,

14
src/util/hass-translation.js
View File

@ -1,6 +1,6 @@
import translationMetadata from '../../build-translations/translationMetadata.json'; import translationMetadata from '../../build-translations/translationMetadata.json';
window.getActiveTranslation = function () { export function getActiveTranslation() {
// Perform case-insenstive comparison since browser isn't required to // Perform case-insenstive comparison since browser isn't required to
// report languages with specific cases. // report languages with specific cases.
const lookup = {}; const lookup = {};
@ -58,18 +58,18 @@ window.getActiveTranslation = function () {
// Final fallback // Final fallback
return 'en'; return 'en';
}; }
// Store loaded translations in memory so translations are available immediately // Store loaded translations in memory so translations are available immediately
// when DOM is created in Polymer. Even a cache lookup creates noticeable latency. // when DOM is created in Polymer. Even a cache lookup creates noticeable latency.
const translations = {}; const translations = {};
window.getTranslation = function (fragment, translationInput) { export function getTranslation(fragment, translationInput) {
const translation = translationInput || getActiveTranslation(); const translation = translationInput || getActiveTranslation();
const metadata = translationMetadata.translations[translation]; const metadata = translationMetadata.translations[translation];
if (!metadata) { if (!metadata) {
if (translationInput !== 'en') { if (translationInput !== 'en') {
return window.getTranslation(fragment, 'en'); return getTranslation(fragment, 'en');
} }
return Promise.reject(new Error('Language en not found in metadata')); return Promise.reject(new Error('Language en not found in metadata'));
} }
@ -89,14 +89,14 @@ window.getTranslation = function (fragment, translationInput) {
delete translations[translationFingerprint]; delete translations[translationFingerprint];
if (translationInput !== 'en') { if (translationInput !== 'en') {
// Couldn't load selected translation. Try a fall back to en before failing. // Couldn't load selected translation. Try a fall back to en before failing.
return window.getTranslation(fragment, 'en'); return getTranslation(fragment, 'en');
} }
return Promise.reject(error); return Promise.reject(error);
}); });
} }
return translations[translationFingerprint]; return translations[translationFingerprint];
}; }
// Load selected translation into memory immediately so it is ready when Polymer // Load selected translation into memory immediately so it is ready when Polymer
// initializes. // initializes.
window.getTranslation(); getTranslation();