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

Adapt to energy sensors supporting GJ (#14181)

Browse Source
This commit is contained in:
Erik Montnemery 2022-10-25 16:48:32 +02:00 committed by GitHub
parent f1139e09f9
commit 57fb8f9f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/recorder.ts
View File

@ -67,7 +67,7 @@ export interface StatisticsValidationResultUnitsChanged {
} }
export interface StatisticsUnitConfiguration { export interface StatisticsUnitConfiguration {
energy?: "Wh" | "kWh" | "MWh"; energy?: "Wh" | "kWh" | "MWh" | "GJ";
power?: "W" | "kW"; power?: "W" | "kW";
pressure?: pressure?:
| "Pa" | "Pa"

4
src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
View File

@ -81,9 +81,9 @@ export class DialogEnergyGasSettings
const pickableUnit = const pickableUnit =
this._pickableUnit || this._pickableUnit ||
(this._params.allowedGasUnitClass === undefined (this._params.allowedGasUnitClass === undefined
? "ft³, m³, Wh, kWh or MWh" ? "ft³, m³, Wh, kWh, MWh or GJ"
: this._params.allowedGasUnitClass === "energy" : this._params.allowedGasUnitClass === "energy"
? "Wh, kWh or MWh" ? "Wh, kWh, MWh or GJ"
: "ft³ or m³"); : "ft³ or m³");
const externalSource = const externalSource =

10
src/translations/en.json
View File

@ -1497,7 +1497,7 @@
"cost_number": "Use a static price", "cost_number": "Use a static price",
"cost_number_input": "Price per {unit}", "cost_number_input": "Price per {unit}",
"gas_usage": "Gas usage", "gas_usage": "Gas usage",
"m3_or_kWh": "ft³, m³, Wh, kWh or MWh" "m3_or_kWh": "ft³, m³, Wh, kWh, MWh or GJ"
} }
}, },
"device_consumption": { "device_consumption": {
@ -1538,19 +1538,19 @@
}, },
"entity_unexpected_unit_energy": { "entity_unexpected_unit_energy": {
"title": "Unexpected unit of measurement", "title": "Unexpected unit of measurement",
"description": "The following entities do not have the expected units of measurement 'Wh', 'kWh' or 'MWh':" "description": "The following entities do not have the expected units of measurement 'Wh', 'kWh', 'MWh' or 'GJ':"
}, },
"entity_unexpected_unit_gas": { "entity_unexpected_unit_gas": {
"title": "Unexpected unit of measurement", "title": "Unexpected unit of measurement",
"description": "The following entities do not have the expected units of measurement 'Wh', 'kWh' or 'MWh' for an energy sensor or 'm³' or 'ft³' for a gas sensor:" "description": "The following entities do not have the expected units of measurement 'Wh', 'kWh', 'MWh' or 'GJ' for an energy sensor or 'm³' or 'ft³' for a gas sensor:"
}, },
"entity_unexpected_unit_energy_price": { "entity_unexpected_unit_energy_price": {
"title": "Unexpected unit of measurement", "title": "Unexpected unit of measurement",
"description": "The following entities do not have the expected units of measurement ''{currency}/kWh'', ''{currency}/Wh'' or ''{currency}/MWh'':" "description": "The following entities do not have the expected units of measurement ''{currency}/kWh'', ''{currency}/Wh'', ''{currency}/MWh'' or ''{currency}/GJ'':"
}, },
"entity_unexpected_unit_gas_price": { "entity_unexpected_unit_gas_price": {
"title": "Unexpected unit of measurement", "title": "Unexpected unit of measurement",
"description": "The following entities do not have the expected units of measurement ''{currency}/kWh'', ''{currency}/Wh'', ''{currency}/MWh'', ''{currency}/m³'' or ''{currency}/ft³'':" "description": "The following entities do not have the expected units of measurement ''{currency}/kWh'', ''{currency}/Wh'', ''{currency}/MWh'', ''{currency}/GJ'', ''{currency}/m³'' or ''{currency}/ft³'':"
}, },
"entity_unexpected_state_class": { "entity_unexpected_state_class": {
"title": "Unexpected state class", "title": "Unexpected state class",