webapp: replace "MPPT" with "(solar) charge controller"

the acronym MPPT does not actually stand for "solar charge controller" at all. we did already replace the term in most places.
hoylabs · Jan 18, 2025 · b7dcb9f · b7dcb9f
1 parent b1dc1c8
commit b7dcb9f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/solarcharger/mqtt/Stats.cpp b/src/solarcharger/mqtt/Stats.cpp
@@ -62,7 +62,7 @@ void Stats::getLiveViewData(JsonVariant& root, const boolean fullUpdate, const u
     const JsonObject instance = root["solarcharger"]["instances"]["MQTT"].to<JsonObject>();
     instance["data_age_ms"] = age;
     instance["hide_serial"] = true;
-    instance["product_id"] = "MPPT: MQTT";
+    instance["product_id"] = "MQTT"; // will be translated by the web app
 
     const JsonObject output = instance["values"]["output"].to<JsonObject>();
 

diff --git a/webapp/src/components/SolarChargerView.vue b/webapp/src/components/SolarChargerView.vue
@@ -19,7 +19,12 @@
                         <div class="p-1 flex-grow-1">
                             <div class="d-flex flex-wrap">
                                 <div style="padding-right: 2em">
-                                    {{ item.product_id }}
+                                    <template v-if="item.product_id === 'MQTT'">
+                                        {{ $t('solarchargerhome.MqttProduct') }}
+                                    </template>
+                                    <template v-else>
+                                        {{ item.product_id }}
+                                    </template>
                                 </div>
                                 <div v-if="item.hide_serial !== true" style="padding-right: 2em">
                                     {{ $t('solarchargerhome.SerialNumber') }}: {{ serial }}

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -172,6 +172,7 @@
         "dBm": "{dbm} dBm"
     },
     "solarchargerhome": {
+        "MqttProduct": "Ladereglerwerte aus MQTT",
         "SerialNumber": "Seriennummer",
         "FirmwareVersion": "Firmware-Version",
         "DataAge": "letzte Aktualisierung",
@@ -436,9 +437,9 @@
         "InverterTotalYieldTotal": "Inverter Gesamtertrag Insgesamt",
         "InverterTotalYieldDay": "Inverter Gesamtertrag Heute",
         "InverterTotalPower": "Inverter Gesamtleistung",
-        "MpptTotalYieldTotal": "MPPT Gesamtertrag Insgesamt",
-        "MpptTotalYieldDay": "MPPT Gesamtertrag Heute",
-        "MpptTotalPower": "MPPT Gesamtleistung",
+        "MpptTotalYieldTotal": "Solarladeregler Gesamtertrag Insgesamt",
+        "MpptTotalYieldDay": "Solarladeregler Gesamtertrag Heute",
+        "MpptTotalPower": "Solarladeregler Gesamtleistung",
         "BatteryCharge": "Batterie Ladezustand",
         "BatteryPower": "Batterie Leistung",
         "HomePower": "Leistung / Netz",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -172,6 +172,7 @@
         "dBm": "{dbm} dBm"
     },
     "solarchargerhome": {
+        "MqttProduct": "Charge controller values from MQTT",
         "SerialNumber": "Serial Number",
         "FirmwareVersion": "Firmware Version",
         "DataAge": "Data Age",
@@ -438,9 +439,9 @@
         "InverterTotalYieldTotal": "Inverter Total Yield Total",
         "InverterTotalYieldDay": "Inverter Total Yield Day",
         "InverterTotalPower": "Inverter Total Power",
-        "MpptTotalYieldTotal": "MPPT Total Yield Total",
-        "MpptTotalYieldDay": "MPPT Total Yield Day",
-        "MpptTotalPower": "MPPT Total Power",
+        "MpptTotalYieldTotal": "Solar Charger Total Yield Total",
+        "MpptTotalYieldDay": "Solar Charger Total Yield Day",
+        "MpptTotalPower": "Solar Charger Total Power",
         "BatteryCharge": "Battery Charge",
         "BatteryPower": "Battery Power",
         "HomePower": "Grid Power",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -169,6 +169,7 @@
         "dBm": "{dbm} dBm"
     },
     "solarchargerhome": {
+        "MqttProduct": "Valeurs du contrôleur de charge à partir de MQTT",
         "SerialNumber": "Numéro de série",
         "FirmwareVersion": "Version du Firmware",
         "DataAge": "Âge des données",
@@ -413,9 +414,9 @@
         "InverterTotalYieldTotal": "Onduleurs rendement total",
         "InverterTotalYieldDay": "Onduleurs rendement du jour",
         "InverterTotalPower": "Onduleurs puissance de l'installation",
-        "MpptTotalYieldTotal": "MPPT rendement total",
-        "MpptTotalYieldDay": "MPPT rendement du jour",
-        "MpptTotalPower": "MPPT puissance de l'installation",
+        "MpptTotalYieldTotal": "Rendement solair total",
+        "MpptTotalYieldDay": "Rendement solaire du jour",
+        "MpptTotalPower": "Puissance totale solaire",
         "BatteryCharge": "Battery Charge",
         "BatteryPower": "Battery Power",
         "HomePower": "Grid Power",