fix prettier & translations

GladysAssistant · Oct 17, 2024 · fc05142 · fc05142
1 parent 5a07b18
commit fc05142
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 48 deletions.
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
@@ -3079,6 +3079,7 @@
       "daily-consumption": "Tagesverbrauch"
     },
     "teleinformation": {
+      "shortCategoryName": "Teleinformation",
       "east": "Gesamte gelieferte aktive Leistung (EAST)",
       "eait": "Gesamte eingespeiste aktive Leistung (EAIT)",
       "easf01": "Gesamte gelieferte aktive Leistung (EASF01)",
@@ -3094,21 +3095,21 @@
       "pref": "Referenzscheinleistung (PREF)",
       "pcoup": "Schwelle der Scheinleistung (PCOUP)",
       "vtic": "Protokollversion (VTIC)",
-      "ccasn": "Aktuelle Position der aktiven Lastkurve (CCASN)", 
-      "ccasn_1": "Vorherige Position der aktiven Lastkurve (CCASN-1)",    
-      "umoy1": "Durchschnittliche effektive Spannung 1 (UMOY1)",     
-      "umoy2": "Durchschnittliche effektive Spannung 2 (UMOY2)",  
-      "umoy3": "Durchschnittliche effektive Spannung 3 (UMOY3)",  
+      "ccasn": "Aktuelle Position der aktiven Lastkurve (CCASN)",
+      "ccasn_1": "Vorherige Position der aktiven Lastkurve (CCASN-1)",
+      "umoy1": "Durchschnittliche effektive Spannung 1 (UMOY1)",
+      "umoy2": "Durchschnittliche effektive Spannung 2 (UMOY2)",
+      "umoy3": "Durchschnittliche effektive Spannung 3 (UMOY3)",
       "erq1": "Gesamte reaktive Leistung 1 (ERQ1)",
-      "erq2": "Gesamte reaktive Leistung 2 (ERQ2)", 
-      "erq3": "Gesamte reaktive Leistung 3 (ERQ3)",  
-      "erq4": "Gesamte reaktive Leistung 4 (ERQ4)",   
+      "erq2": "Gesamte reaktive Leistung 2 (ERQ2)",
+      "erq3": "Gesamte reaktive Leistung 3 (ERQ3)",
+      "erq4": "Gesamte reaktive Leistung 4 (ERQ4)",
       "irms1": "Effektiver Strom 1 (IRMS1)",
-      "irms2": "Effektiver Strom 2 (IRMS2)", 
-      "irms3": "Effektiver Strom 3 (IRMS3)",    
-      "urms1": "Effektive Spannung 1 (URMS1)",  
-      "urms2": "Effektive Spannung 2 (URMS2)", 
-      "urms3": "Effektive Spannung 3 (URMS3)",   
+      "irms2": "Effektiver Strom 2 (IRMS2)",
+      "irms3": "Effektiver Strom 3 (IRMS3)",
+      "urms1": "Effektive Spannung 1 (URMS1)",
+      "urms2": "Effektive Spannung 2 (URMS2)",
+      "urms3": "Effektive Spannung 3 (URMS3)",
       "easd01": "Gesamte aktive Leistung 1 (EASD01)",
       "easd02": "Gesamte aktive Leistung 2 (EASD02)",
       "easd03": "Gesamte aktive Leistung 3 (EASD03)",

diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
@@ -3079,6 +3079,7 @@
       "daily-consumption": "Daily Consumption"
     },
     "teleinformation": {
+      "shortCategoryName": "Teleinformation",
       "east": "Total active power delivered (EAST)",
       "eait": "Total active power injected (EAIT)",
       "easf01": "Total active power delivered (EASF01)",
@@ -3094,21 +3095,21 @@
       "pref": "Reference apparent power (PREF)",
       "pcoup": "Apparent power threshold (PCOUP)",
       "vtic": "Protocol version (VTIC)",
-      "ccasn": "Current position of the active load curve (CCASN)", 
-      "ccasn_1": "Previous position of the active load curve (CCASN-1)",    
-      "umoy1": "Average effective voltage 1 (UMOY1)",     
-      "umoy2": "Average effective voltage 2 (UMOY2)",  
-      "umoy3": "Average effective voltage 3 (UMOY3)",  
+      "ccasn": "Current position of the active load curve (CCASN)",
+      "ccasn_1": "Previous position of the active load curve (CCASN-1)",
+      "umoy1": "Average effective voltage 1 (UMOY1)",
+      "umoy2": "Average effective voltage 2 (UMOY2)",
+      "umoy3": "Average effective voltage 3 (UMOY3)",
       "erq1": "Total reactive power 1 (ERQ1)",
-      "erq2": "Total reactive power 2 (ERQ2)", 
-      "erq3": "Total reactive power 3 (ERQ3)",  
-      "erq4": "Total reactive power 4 (ERQ4)",   
+      "erq2": "Total reactive power 2 (ERQ2)",
+      "erq3": "Total reactive power 3 (ERQ3)",
+      "erq4": "Total reactive power 4 (ERQ4)",
       "irms1": "Effective current 1 (IRMS1)",
-      "irms2": "Effective current 2 (IRMS2)", 
-      "irms3": "Effective current 3 (IRMS3)",    
-      "urms1": "Effective voltage 1 (URMS1)",  
-      "urms2": "Effective voltage 2 (URMS2)", 
-      "urms3": "Effective voltage 3 (URMS3)",   
+      "irms2": "Effective current 2 (IRMS2)",
+      "irms3": "Effective current 3 (IRMS3)",
+      "urms1": "Effective voltage 1 (URMS1)",
+      "urms2": "Effective voltage 2 (URMS2)",
+      "urms3": "Effective voltage 3 (URMS3)",
       "easd01": "Total active power 1 (EASD01)",
       "easd02": "Total active power 2 (EASD02)",
       "easd03": "Total active power 3 (EASD03)",

diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
@@ -3079,6 +3079,7 @@
       "daily-consumption": "Consommation journalière"
     },
     "teleinformation": {
+      "shortCategoryName": "Téléinformation",
       "east": "Puissance active totale délivrée (EAST)",
       "eait": "Puissance active totale injectée (EAIT)",
       "easf01": "Puissance active totale délivrée (EASF01)",
@@ -3094,21 +3095,21 @@
       "pref": "Puissance apparente référence (PREF)",
       "pcoup": "Seuil de puissance apparente (PCOUP)",
       "vtic": "Version du protocole (VTIC)",
-      "ccasn": "Actuelle position de la courbe charge active (CCASN)", 
-      "ccasn_1": "Précédente position de la courbe charge active (CCASN-1)",    
-      "umoy1": "Tension efficace moyenne 1 (UMOY1)",     
-      "umoy2": "Tension efficace moyenne 2 (UMOY2)",  
-      "umoy3": "Tension efficace moyenne 3 (UMOY3)",  
+      "ccasn": "Position de la courbe charge active (CCASN)",
+      "ccasn_1": "Position de la courbe charge active (CCASN-1)",
+      "umoy1": "Tension efficace moyenne 1 (UMOY1)",
+      "umoy2": "Tension efficace moyenne 2 (UMOY2)",
+      "umoy3": "Tension efficace moyenne 3 (UMOY3)",
       "erq1": "Puissance réactive totale 1 (ERQ1)",
-      "erq2": "Puissance réactive totale 2 (ERQ2)", 
-      "erq3": "Puissance réactive totale 3 (ERQ3)",  
-      "erq4": "Puissance réactive totale 4 (ERQ4)",   
+      "erq2": "Puissance réactive totale 2 (ERQ2)",
+      "erq3": "Puissance réactive totale 3 (ERQ3)",
+      "erq4": "Puissance réactive totale 4 (ERQ4)",
       "irms1": "Courant efficace 1 (IRMS1)",
-      "irms2": "Courant efficace 2 (IRMS2)", 
-      "irms3": "Courant efficace 3 (IRMS3)",    
-      "urms1": "Tension efficace 1 (URMS1)",  
-      "urms2": "Tension efficace 2 (URMS2)", 
-      "urms3": "Tension efficace 3 (URMS3)",   
+      "irms2": "Courant efficace 2 (IRMS2)",
+      "irms3": "Courant efficace 3 (IRMS3)",
+      "urms1": "Tension efficace 1 (URMS1)",
+      "urms2": "Tension efficace 2 (URMS2)",
+      "urms3": "Tension efficace 3 (URMS3)",
       "easd01": "Puissance active totale 1 (EASD01)",
       "easd02": "Puissance active totale 2 (EASD02)",
       "easd03": "Puissance active totale 3 (EASD03)",
@@ -3122,7 +3123,7 @@
       "relais": "Relais",
       "smaxn": "Puissance apparente délivrée de crête 1 (SMAXN)",
       "smaxn2": "Puissance apparente délivrée de crête 2 (SMAXN2)",
-      "smawn3": "Puissance apparente délivrée de crête 3 (SMAXN3)",
+      "smaxn3": "Puissance apparente délivrée de crête 3 (SMAXN3)",
       "sinsts": "Puissance apparente immédiate délivrée 1 (SINSTS)",
       "sinsts2": "Puissance apparente immédiate délivrée 2 (SINSTS2)",
       "sinsts3": "Puissance apparente immédiate délivrée 3 (SINSTS3)",

diff --git a/front/src/utils/consts.js b/front/src/utils/consts.js
@@ -277,7 +277,7 @@ export const DeviceFeatureCategoriesIcon = {
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE]: 'zap',
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.INDEX]: 'zap'
   },
-[DEVICE_FEATURE_CATEGORIES.TELEINFORMATION]: {
+  [DEVICE_FEATURE_CATEGORIES.TELEINFORMATION]: {
     [DEVICE_FEATURE_TYPES.TELEINFORMATION.EAST]: 'zap',
     [DEVICE_FEATURE_TYPES.TELEINFORMATION.EAIT]: 'zap',
     [DEVICE_FEATURE_TYPES.TELEINFORMATION.EASF01]: 'zap',

diff --git a/server/services/zigbee2mqtt/exposes/numericType.js b/server/services/zigbee2mqtt/exposes/numericType.js
@@ -396,7 +396,7 @@ module.exports = {
       feature: {
         category: DEVICE_FEATURE_CATEGORIES.TELEINFORMATION,
         type: DEVICE_FEATURE_TYPES.TELEINFORMATION.VTIC,
-      }
+      },
     },
     CCASN: {
       feature: {
@@ -627,7 +627,7 @@ module.exports = {
         type: DEVICE_FEATURE_TYPES.TELEINFORMATION.SINSTS3,
         unit: DEVICE_FEATURE_UNITS.VOLT_AMPERE,
       },
-    },    
+    },
     'SMAXN-1': {
       feature: {
         category: DEVICE_FEATURE_CATEGORIES.TELEINFORMATION,

diff --git a/server/utils/constants.js b/server/utils/constants.js
@@ -620,8 +620,6 @@ const DEVICE_FEATURE_TYPES = {
     EASF08: 'easf08',
     EASF09: 'easf09',
     EASF10: 'easf10',
-    ADSC: 'adsc',
-    PRM: 'prm',
     PREF: 'pref',
     PCOUP: 'pcoup',
     VTIC: 'vtic',
@@ -644,7 +642,6 @@ const DEVICE_FEATURE_TYPES = {
     EASD02: 'easd02',
     EASD03: 'easd03',
     EASD04: 'easd04',
-    DATE: 'date',
     NTARF: 'ntarf',
     CCAIN: 'ccain',
     CCAIN_1: 'ccain_1',
@@ -661,9 +658,7 @@ const DEVICE_FEATURE_TYPES = {
     SMAXN_1: 'smaxn_1',
     SMAXN2_1: 'smaxn2_1',
     SMAXN3_1: 'smaxn3_1',
-    PTEC: 'ptec',
     HHPHC: 'hhphc',
-    DEMAIN: 'demain',
     IMAX: 'imax',
     ADPS: 'adps',
     IMAX2: 'imax2',