From 2737de033d67cee10b80fa48baeceb1e86669af2 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Wed, 18 Oct 2023 22:45:59 +0200 Subject: [PATCH] =?UTF-8?q?Smart=20Grid=20Charging:=20use=20=E2=89=A4=20in?= =?UTF-8?q?stead=20of=20<=20for=20limits=20(#10381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/components/GridSettingsModal.vue | 6 +++--- i18n/de.toml | 4 ++-- i18n/en.toml | 4 ++-- i18n/es.toml | 4 ++-- i18n/lt.toml | 4 ++-- i18n/pt.toml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/js/components/GridSettingsModal.vue b/assets/js/components/GridSettingsModal.vue index 77e0f185a..101bd60da 100644 --- a/assets/js/components/GridSettingsModal.vue +++ b/assets/js/components/GridSettingsModal.vue @@ -146,7 +146,7 @@ export default { } values.sort((a, b) => a - b); return values.map((value) => { - const name = `< ${ + const name = `≤ ${ this.isCo2 ? this.fmtCo2Medium(value) : this.fmtPricePerKWh(value, this.currency) @@ -195,7 +195,7 @@ export default { // TODO: handle multiple matching time slots const price = this.findSlotInRange(start, end, rates)?.price; const charging = - price < this.selectedSmartCostLimit && this.selectedSmartCostLimit !== 0; + price <= this.selectedSmartCostLimit && this.selectedSmartCostLimit !== 0; const selectable = price !== undefined; result.push({ day, price, startHour, endHour, charging, selectable }); } @@ -321,7 +321,7 @@ export default { this.selectedSmartCostLimit = 0; return; } - const nextOption = this.costOptions.find(({ value }) => value > limit); + const nextOption = this.costOptions.find(({ value }) => value >= limit); if (nextOption) { this.selectedSmartCostLimit = nextOption.value; } diff --git a/i18n/de.toml b/i18n/de.toml index 57ac6edac..ac005704d 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -282,8 +282,8 @@ vehicleTarget = "Fahrzeuglimit: {soc}%" [main.vehicleStatus] charging = "Ladevorgang aktiv …" -cheapEnergyCharging = "Lade günstige Energie: {price} (Grenze < {limit})" -cleanEnergyCharging = "Lade saubere Energie: {co2} (Grenze < {limit})" +cheapEnergyCharging = "Lade günstige Energie: {price} (Grenze {limit})" +cleanEnergyCharging = "Lade saubere Energie: {co2} (Grenze {limit})" climating = "Vorklimatisierung erkannt." connected = "Verbunden." disconnected = "Nicht verbunden." diff --git a/i18n/en.toml b/i18n/en.toml index f437018f6..e78f176b5 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -279,8 +279,8 @@ vehicleTarget = "Vehicle limit: {soc}%" [main.vehicleStatus] charging = "Charging…" -cheapEnergyCharging = "Charging cheap energy: {price} (limit < {limit})" -cleanEnergyCharging = "Charging clean energy: {co2} (limit < {limit})" +cheapEnergyCharging = "Charging cheap energy: {price} (limit {limit})" +cleanEnergyCharging = "Charging clean energy: {co2} (limit {limit})" climating = "Pre-conditioning detected." connected = "Connected." disconnected = "Disconnected." diff --git a/i18n/es.toml b/i18n/es.toml index f8d5f58bb..e929fb5ea 100644 --- a/i18n/es.toml +++ b/i18n/es.toml @@ -286,8 +286,8 @@ vehicleTarget = "límite de vehículo: {soc}%" [main.vehicleStatus] charging = "Cargando ..." -cheapEnergyCharging = "Cargando con energía barata: {price} (limit < {limit})" -cleanEnergyCharging = "Cargando con energía limpia: {co2} (limit < {limit})" +cheapEnergyCharging = "Cargando con energía barata: {price} (limit {limit})" +cleanEnergyCharging = "Cargando con energía limpia: {co2} (limit {limit})" climating = "Preacondicionamiento detectado." connected = "Conectado." disconnected = "Desconectado." diff --git a/i18n/lt.toml b/i18n/lt.toml index 66bacb73e..db6ffad8a 100644 --- a/i18n/lt.toml +++ b/i18n/lt.toml @@ -286,8 +286,8 @@ vehicleTarget = "Automobilyje nustatytas limitas: {soc}%" [main.vehicleStatus] charging = "Įkraunama..." -cheapEnergyCharging = "Įkraunama pigia energija: {price} (limit < {limit})" -cleanEnergyCharging = "Įkraunama švaria energija: {co2} (limit < {limit})" +cheapEnergyCharging = "Įkraunama pigia energija: {price} (limit {limit})" +cleanEnergyCharging = "Įkraunama švaria energija: {co2} (limit {limit})" climating = "Aptiktas išankstinis kondicionavimas." connected = "Prijungtas." disconnected = "Neprijungtas." diff --git a/i18n/pt.toml b/i18n/pt.toml index 210751519..228ef307b 100644 --- a/i18n/pt.toml +++ b/i18n/pt.toml @@ -286,8 +286,8 @@ vehicleTarget = "Limite de veículo: {soc}%" [main.vehicleStatus] charging = "Carregando..." -cheapEnergyCharging = "Carregando energia barata: {price} (limit < {limit})" -cleanEnergyCharging = "Carregando energia limpa: {co2} (limit < {limit})" +cheapEnergyCharging = "Carregando energia barata: {price} (limit {limit})" +cleanEnergyCharging = "Carregando energia limpa: {co2} (limit {limit})" climating = "Pré-condicionamento detectado." connected = "Ligado." disconnected = "Não conectado."