From 5e1bd2025c3596ee25d1f1be6af19b303c7fc076 Mon Sep 17 00:00:00 2001 From: andig Date: Tue, 26 May 2026 08:21:37 +0200 Subject: [PATCH] Energyflow UI: standardize battery forecast wording (#30197) --- assets/js/components/Energyflow/ForecastMessage.vue | 11 ++++++----- i18n/de.json | 8 ++++---- i18n/en.json | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/assets/js/components/Energyflow/ForecastMessage.vue b/assets/js/components/Energyflow/ForecastMessage.vue index fda166b87..030552e75 100644 --- a/assets/js/components/Energyflow/ForecastMessage.vue +++ b/assets/js/components/Energyflow/ForecastMessage.vue @@ -19,7 +19,11 @@ export default defineComponent({ computed: { label(): string { if (this.point.limit) { - return this.$t("main.energyflow.forecast"); + return this.$t( + this.high + ? "main.energyflow.batteryForecastFull" + : "main.energyflow.batteryForecastEmpty" + ); } return this.$t( this.high @@ -30,10 +34,7 @@ export default defineComponent({ message(): string { const time = this.fmtAbsoluteDate(new Date(this.point.time)); if (this.point.limit) { - const key = this.high - ? "main.energyflow.batteryForecastFull" - : "main.energyflow.batteryForecastEmpty"; - return this.$t(key, { time }); + return time; } const soc = this.fmtPercentage(this.point.soc); return `${time} (${soc})`; diff --git a/i18n/de.json b/i18n/de.json index f2770b245..da04eae7c 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -1156,10 +1156,10 @@ "battery": "Batterie", "batteryCharge": "Batterie laden", "batteryDischarge": "Batterie entladen", - "batteryForecastEmpty": "Leer ab {time}", - "batteryForecastFull": "Voll ab {time}", - "batteryForecastNextHigh": "Nächstes Hoch", - "batteryForecastNextLow": "Nächstes Tief", + "batteryForecastEmpty": "Leer", + "batteryForecastFull": "Voll", + "batteryForecastNextHigh": "Hoch", + "batteryForecastNextLow": "Tief", "batteryGridChargeActive": "Netzladen: aktiv", "batteryGridChargeLimit": "Netzladen: wenn", "batteryHold": "Batterie (gesperrt)", diff --git a/i18n/en.json b/i18n/en.json index 582e88b45..a153c0775 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1156,10 +1156,10 @@ "battery": "Battery", "batteryCharge": "Battery charging", "batteryDischarge": "Battery discharging", - "batteryForecastEmpty": "Empty from {time}", - "batteryForecastFull": "Full from {time}", - "batteryForecastNextHigh": "Next high", - "batteryForecastNextLow": "Next low", + "batteryForecastEmpty": "Empty", + "batteryForecastFull": "Full", + "batteryForecastNextHigh": "High", + "batteryForecastNextLow": "Low", "batteryGridChargeActive": "Grid charging: active", "batteryGridChargeLimit": "Grid charging: when", "batteryHold": "Battery (locked)",