From dc3d4d9256c04225814e3a698f316fba0ee11ab2 Mon Sep 17 00:00:00 2001 From: Hannes Date: Sun, 31 Mar 2024 15:30:48 +0200 Subject: [PATCH] UI: fix & update translations (#2595) * Fix Emergency-Slider Translation * Fix EMERGENCY_RESERVE Case Match --- .../history/storage/socchart.component.ts | 2 +- .../common/storage/modal/modal.component.html | 12 +++++----- .../settings/alerting/alerting.component.html | 22 +++++++++---------- .../settings/alerting/alerting.component.ts | 16 +++++++------- ui/src/assets/i18n/cz.json | 4 ++-- ui/src/assets/i18n/de.json | 4 ++-- ui/src/assets/i18n/en.json | 4 ++-- ui/src/assets/i18n/es.json | 4 ++-- ui/src/assets/i18n/fr.json | 4 ++-- ui/src/assets/i18n/ja.json | 4 ++-- ui/src/assets/i18n/nl.json | 4 ++-- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/ui/src/app/edge/history/storage/socchart.component.ts b/ui/src/app/edge/history/storage/socchart.component.ts index 05648a9d981..908a9978918 100644 --- a/ui/src/app/edge/history/storage/socchart.component.ts +++ b/ui/src/app/edge/history/storage/socchart.component.ts @@ -96,7 +96,7 @@ export class SocStorageChartComponent extends AbstractHistoryChart implements On if (channelAddress.channelId === 'ActualReserveSoc') { datasets.push({ label: - this.emergencyCapacityReserveComponents.length > 1 ? component.alias : this.translate.instant("Edge.Index.EmergencyReserve.emergencyReserve"), + this.emergencyCapacityReserveComponents.length > 1 ? component.alias : this.translate.instant("Edge.Index.EmergencyReserve.EMERGENCY_RESERVE"), data: data, borderDash: [3, 3], diff --git a/ui/src/app/edge/live/common/storage/modal/modal.component.html b/ui/src/app/edge/live/common/storage/modal/modal.component.html index d0c77b98de7..4e83cd402e7 100644 --- a/ui/src/app/edge/live/common/storage/modal/modal.component.html +++ b/ui/src/app/edge/live/common/storage/modal/modal.component.html @@ -106,7 +106,7 @@ - Edge.Index.EmergencyReserve.emergencyReserve + Edge.Index.EmergencyReserve.EMERGENCY_RESERVE {{formGroup.value[component.id]?.['emergencyReserveController']?.reserveSoc| @@ -133,7 +133,7 @@ - Edge.Index.EmergencyReserve.InfoForEmergencyReserveSlider + Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER @@ -486,7 +486,7 @@ - Edge.Index.EmergencyReserve.emergencyReserve + Edge.Index.EmergencyReserve.EMERGENCY_RESERVE {{formGroup.value[component.id]?.['emergencyReserveController']?.reserveSoc| @@ -515,7 +515,7 @@ - Edge.Index.EmergencyReserve.InfoForEmergencyReserveSlider + Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER @@ -720,7 +720,7 @@ - Edge.Index.EmergencyReserve.emergencyReserve + Edge.Index.EmergencyReserve.EMERGENCY_RESERVE {{formGroup.value[component.id]?.['emergencyReserveController']?.reserveSoc| @@ -747,7 +747,7 @@ - Edge.Index.EmergencyReserve.InfoForEmergencyReserveSlider + Edge.Index.EmergencyReserve.INFO_FOR_EMERGENCY_RESERVE_SLIDER diff --git a/ui/src/app/edge/settings/alerting/alerting.component.html b/ui/src/app/edge/settings/alerting/alerting.component.html index a2f62d76593..0177269976c 100644 --- a/ui/src/app/edge/settings/alerting/alerting.component.html +++ b/ui/src/app/edge/settings/alerting/alerting.component.html @@ -31,12 +31,12 @@ - Edge.Config.Alerting.activate + Edge.Config.ALERTING.ACTIVATE - Edge.Config.Alerting.delay + Edge.Config.ALERTING.DELAY @@ -47,7 +47,7 @@ - Edge.Config.Alerting.offlineAlerting + Edge.Config.ALERTING.OFFLINE @@ -72,7 +72,7 @@ - Edge.Config.Alerting.faultAlerting + Edge.Config.ALERTING.FAULT @@ -97,7 +97,7 @@ - Edge.Config.Alerting.warningAlerting + Edge.Config.ALERTING.WARNING @@ -153,17 +153,17 @@ - Edge.Config.Alerting.offlineAlerting + Edge.Config.ALERTING.OFFLINE - Edge.Config.Alerting.faultAlerting + Edge.Config.ALERTING.FAULT - Edge.Config.Alerting.warningAlerting + Edge.Config.ALERTING.WARNING @@ -182,7 +182,7 @@ - Edge.Config.Alerting.deactivated + Edge.Config.ALERTING.DEACTIVATED @@ -197,7 +197,7 @@ - Edge.Config.Alerting.deactivated + Edge.Config.ALERTING.DEACTIVATED @@ -212,7 +212,7 @@ - Edge.Config.Alerting.deactivated + Edge.Config.ALERTING.DEACTIVATED diff --git a/ui/src/app/edge/settings/alerting/alerting.component.ts b/ui/src/app/edge/settings/alerting/alerting.component.ts index d65fe7cdfb4..e95c2b35109 100644 --- a/ui/src/app/edge/settings/alerting/alerting.component.ts +++ b/ui/src/app/edge/settings/alerting/alerting.component.ts @@ -185,22 +185,22 @@ export class AlertingComponent implements OnInit { */ protected getLabelToDelay(delay: number): string { if (delay <= 0) { - return this.translate.instant("Edge.Config.Alerting.deactivated"); + return this.translate.instant("Edge.Config.ALERTING.DEACTIVATED"); } if (delay >= 1440) { delay = delay / 1440; return delay + ' ' + (delay == 1 - ? this.translate.instant("Edge.Config.Alerting.interval.day") - : this.translate.instant("Edge.Config.Alerting.interval.days")); + ? this.translate.instant("General.TIME.DAY") + : this.translate.instant("General.TIME.DAYS")); } else if (delay >= 60) { delay = delay / 60; return delay + ' ' + (delay == 1 - ? this.translate.instant("Edge.Config.Alerting.interval.hour") - : this.translate.instant("Edge.Config.Alerting.interval.hours")); + ? this.translate.instant("General.TIME.HOUR") + : this.translate.instant("General.TIME.HOURS")); } else { return delay + ' ' + (delay == 1 - ? this.translate.instant("Edge.Config.Alerting.interval.minute") - : this.translate.instant("Edge.Config.Alerting.interval.minutes")); + ? this.translate.instant("General.TIME.MINUTE") + : this.translate.instant("General.TIME.MINUTES")); } } @@ -292,7 +292,7 @@ export class AlertingComponent implements OnInit { }).catch(reason => { let error = reason.error; console.error(error); - this.errorToast(this.translate.instant('Edge.Config.Alerting.toast.error'), error.message); + this.errorToast(this.translate.instant('Edge.Config.ALERTING.TOAST.ERROR'), error.message); reject(reason); }).finally(() => { this.service.stopSpinner(this.spinnerId); diff --git a/ui/src/assets/i18n/cz.json b/ui/src/assets/i18n/cz.json index 410c67d8382..04ac9dd63ec 100644 --- a/ui/src/assets/i18n/cz.json +++ b/ui/src/assets/i18n/cz.json @@ -169,8 +169,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "Aktivací nouzové rezervy výkonu lze libovolně zvolit hodnotu mezi 5 % a 100 %.", - "emergencyReserve": "pohotovostní rezerva" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "Aktivací nouzové rezervy výkonu lze libovolně zvolit hodnotu mezi 5 % a 100 %.", + "EMERGENCY_RESERVE": "pohotovostní rezerva" }, "Energymonitor": { "activePower": "Činný výkon", diff --git a/ui/src/assets/i18n/de.json b/ui/src/assets/i18n/de.json index 30132ccecef..0b5f4c8cd9e 100644 --- a/ui/src/assets/i18n/de.json +++ b/ui/src/assets/i18n/de.json @@ -11,8 +11,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "Durch Aktivieren kann eine Notstromreserve zwischen 5 % und 100 % der Batteriekapazität eingestellt werden.", - "emergencyReserve": "Notstromreserve" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "Durch Aktivieren kann eine Notstromreserve zwischen 5 % und 100 % der Batteriekapazität eingestellt werden.", + "EMERGENCY_RESERVE": "Notstromreserve" }, "Energymonitor": { "activePower": "Ausgabeleistung", diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json index e16096007cf..fa02d57c5e8 100644 --- a/ui/src/assets/i18n/en.json +++ b/ui/src/assets/i18n/en.json @@ -11,8 +11,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "By activating the emergency power reserve, the value can be freely selected between 5% and 100%.", - "emergencyReserve": "Emergencyreserve" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "By activating the emergency power reserve, the value can be freely selected between 5% and 100%.", + "EMERGENCY_RESERVE": "Emergencyreserve" }, "Energymonitor": { "activePower": "Active power", diff --git a/ui/src/assets/i18n/es.json b/ui/src/assets/i18n/es.json index f9bea4738bc..251dd41029d 100644 --- a/ui/src/assets/i18n/es.json +++ b/ui/src/assets/i18n/es.json @@ -161,8 +161,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "Al activar la reserva de energía de emergencia, el valor puede seleccionarse libremente entre el 5% y el 100%.", - "emergencyReserve": "reserva de emergencia" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "Al activar la reserva de energía de emergencia, el valor puede seleccionarse libremente entre el 5% y el 100%.", + "EMERGENCY_RESERVE": "reserva de emergencia" }, "Energymonitor": { "activePower": "Potencia de salida", diff --git a/ui/src/assets/i18n/fr.json b/ui/src/assets/i18n/fr.json index 6c72db794c9..2ead4d8e8c0 100644 --- a/ui/src/assets/i18n/fr.json +++ b/ui/src/assets/i18n/fr.json @@ -163,8 +163,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "En activant la réserve d'énergie de secours, la valeur peut être librement choisie entre 5 % et 100 %.", - "emergencyReserve": "réserve d'urgence" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "En activant la réserve d'énergie de secours, la valeur peut être librement choisie entre 5 % et 100 %.", + "EMERGENCY_RESERVE": "réserve d'urgence" }, "Energymonitor": { "activePower": "Puissance Active", diff --git a/ui/src/assets/i18n/ja.json b/ui/src/assets/i18n/ja.json index b9178238ecd..06a7294eb4f 100644 --- a/ui/src/assets/i18n/ja.json +++ b/ui/src/assets/i18n/ja.json @@ -11,8 +11,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "緊急電力予備を有効にすることで、値は5％から100％まで自由に選択することができます。", - "emergencyReserve": "緊急予備" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "緊急電力予備を有効にすることで、値は5％から100％まで自由に選択することができます。", + "EMERGENCY_RESERVE": "緊急予備" }, "Energymonitor": { "activePower": "アクティブパワー", diff --git a/ui/src/assets/i18n/nl.json b/ui/src/assets/i18n/nl.json index cc2ddce0c21..77d013c0482 100644 --- a/ui/src/assets/i18n/nl.json +++ b/ui/src/assets/i18n/nl.json @@ -158,8 +158,8 @@ "Edge": { "Index": { "EmergencyReserve": { - "InfoForEmergencyReserveSlider": "Door de noodstroomreserve te activeren, kan de waarde vrij worden gekozen tussen 5% en 100%.", - "emergencyReserve": "noodreserve" + "INFO_FOR_EMERGENCY_RESERVE_SLIDER": "Door de noodstroomreserve te activeren, kan de waarde vrij worden gekozen tussen 5% en 100%.", + "EMERGENCY_RESERVE": "noodreserve" }, "Energymonitor": { "activePower": "Actief vermogen",