From 05f2ef8a37a99a97b53817c20690b1debc7b8753 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Mon, 10 Oct 2022 16:21:02 +0200
Subject: [PATCH] Some fixes for low carbon display (#14020)

---
 .../energy/hui-energy-carbon-consumed-gauge-card.ts    |  8 ++------
 .../cards/energy/hui-energy-distribution-card.ts       | 10 ++++------
 src/translations/en.json                               |  6 +++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
index 20dce6b0f6..33271eeca4 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
@@ -85,10 +85,6 @@ class HuiEnergyCarbonGaugeCard
 
     let value: number | undefined;
 
-    if (totalGridConsumption === 0) {
-      value = 100;
-    }
-
     if (this._data.fossilEnergyConsumption && totalGridConsumption) {
       const highCarbonEnergy = this._data.fossilEnergyConsumption
         ? Object.values(this._data.fossilEnergyConsumption).reduce(
@@ -141,12 +137,12 @@ class HuiEnergyCarbonGaugeCard
               ></ha-gauge>
               <div class="name">
                 ${this.hass.localize(
-                  "ui.panel.lovelace.cards.energy.carbon_consumed_gauge.non_fossil_energy_consumed"
+                  "ui.panel.lovelace.cards.energy.carbon_consumed_gauge.low_carbon_energy_consumed"
                 )}
               </div>
             `
           : html`${this.hass.localize(
-              "ui.panel.lovelace.cards.energy.carbon_consumed_gauge.non_fossil_energy_not_calculated"
+              "ui.panel.lovelace.cards.energy.carbon_consumed_gauge.low_carbon_energy_not_calculated"
             )}`}
       </ha-card>
     `;
diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
index cb311b7637..c8318e800d 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -262,7 +262,7 @@ class HuiEnergyDistrubutionCard
                   : html`<div class="circle-container low-carbon">
                       <span class="label"
                         >${this.hass.localize(
-                          "ui.panel.lovelace.cards.energy.energy_distribution.non_fossil"
+                          "ui.panel.lovelace.cards.energy.energy_distribution.low_carbon"
                         )}</span
                       >
                       <a
@@ -272,11 +272,9 @@ class HuiEnergyDistrubutionCard
                         rel="noopener no referrer"
                       >
                         <ha-svg-icon .path=${mdiLeaf}></ha-svg-icon>
-                        ${lowCarbonEnergy
-                          ? formatNumber(lowCarbonEnergy, this.hass.locale, {
-                              maximumFractionDigits: 1,
-                            })
-                          : "—"}
+                        ${formatNumber(lowCarbonEnergy || 0, this.hass.locale, {
+                          maximumFractionDigits: 1,
+                        })}
                         kWh
                       </a>
                       <svg width="80" height="30">
diff --git a/src/translations/en.json b/src/translations/en.json
index b76ead6655..a993014576 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3691,7 +3691,7 @@
               "grid": "Grid",
               "gas": "Gas",
               "solar": "Solar",
-              "non_fossil": "Non-fossil",
+              "low_carbon": "Low-carbon",
               "home": "Home",
               "battery": "Battery",
               "go_to_energy_dashboard": "Go to the energy dashboard"
@@ -3702,8 +3702,8 @@
             },
             "carbon_consumed_gauge": {
               "card_indicates_energy_used": "This card indicates how much of the energy consumed by your home was generated using non-fossil fuels like solar, wind and nuclear. The higher, the better!",
-              "non_fossil_energy_consumed": "Non-fossil energy consumed",
-              "non_fossil_energy_not_calculated": "Consumed non-fossil energy couldn't be calculated"
+              "low_carbon_energy_consumed": "Low-carbon energy consumed",
+              "low_carbon_energy_not_calculated": "Consumed low-carbon energy couldn't be calculated"
             }
           }
         },