From 7f681243e27237d9d68d539641e7ed017e228751 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Tue, 21 Oct 2025 09:54:40 +0200 Subject: [PATCH] chore: simplify meter usage translations (#24493) --- assets/js/components/Config/MeterModal.vue | 4 +--- i18n/de.json | 8 ++++---- i18n/en.json | 10 +++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/assets/js/components/Config/MeterModal.vue b/assets/js/components/Config/MeterModal.vue index 2b742e6c5..fc64e9003 100644 --- a/assets/js/components/Config/MeterModal.vue +++ b/assets/js/components/Config/MeterModal.vue @@ -191,7 +191,7 @@ export default defineComponent({ return this.id === undefined; }, extMeterUsageOptions() { - return ["grid", "pv", "battery", "charge", "aux"].map((key) => ({ + return ["charge", "aux", "grid", "pv", "battery"].map((key) => ({ name: this.$t(`config.meter.usage.${key}`), key, })); @@ -249,12 +249,10 @@ export default defineComponent({ return data; }, handleTemplateChange(e: Event, values: DeviceValues) { - console.log("[MeterModal] handleTemplateChange", { e, values }); const value = (e.target as HTMLSelectElement).value; if (value === ConfigType.Custom) { values.type = ConfigType.Custom; values.yaml = defaultMeterYaml; - console.log("[MeterModal] set type/yaml", { type: values.type, yaml: values.yaml }); } }, applyCustomDefaults(_template: Template | null, values: DeviceValues) { diff --git a/i18n/de.json b/i18n/de.json index 4ecdd42e6..da4523ef9 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -356,11 +356,11 @@ "titleLabel": "Titel", "usage": { "aux": "Intelligenter Verbraucher", - "battery": "Batteriezähler", - "charge": "Ladegerätzähler", - "grid": "Netzzähler", + "battery": "Batterie", + "charge": "Verbraucher / Ladegerät", + "grid": "Netzanschluss", "label": "Verwendung", - "pv": "PV-Zähler" + "pv": "Erzeugung" }, "validateSave": "Überprüfen & speichern" }, diff --git a/i18n/en.json b/i18n/en.json index 0f3d733f3..a921a18d3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -355,12 +355,12 @@ "titleChoice": "What Do You Want To Add?", "titleLabel": "Title", "usage": { - "aux": "Self-regulating consumer meter", - "battery": "Battery meter", - "charge": "Charger meter", - "grid": "Grid meter", + "aux": "Self-regulating consumer", + "battery": "Battery", + "charge": "Consumer / Charger", + "grid": "Grid", "label": "Usage", - "pv": "Solar meter" + "pv": "Production" }, "validateSave": "Validate & save" },