From 264174669ded6daf1e7313689f1a47e00f14e6be Mon Sep 17 00:00:00 2001
From: Flippchen <91947480+Flippchen@users.noreply.github.com>
Date: Wed, 17 May 2023 10:49:15 +0200
Subject: [PATCH] added kilowatthour to energy units (#1944)

* added kilowatthour to energy units

* fixed false change

* Update src/Calculator/Resources/en-US/Resources.resw

Co-authored-by: Adam Sasine <adam.sasine@gmail.com>

* fix: translations, description

* fix: empty line

---------

Co-authored-by: Adam Sasine <adam.sasine@gmail.com>
---
 .../DataLoaders/UnitConverterDataConstants.h              | 3 ++-
 src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp | 8 ++++++++
 src/Calculator/Resources/en-US/Resources.resw             | 8 ++++++++
 src/CalculatorUnitTests/Test.resw                         | 3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
index 099b3b1f..33c94d62 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
@@ -164,7 +164,8 @@ namespace CalculatorApp
             Data_Zetabits = UnitStart + 163,
             Data_Zetabytes = UnitStart + 164,
             Area_Pyeong = UnitStart + 165,
-            UnitEnd = Area_Pyeong
+            Energy_Kilowatthour = UnitStart + 166,
+            UnitEnd = Energy_Kilowatthour
         };
     }
 }
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
index 3ce1cb69..9cb0e811 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
@@ -358,6 +358,13 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
                                        true,
                                        false,
                                        false });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilowatthour,
+                                       GetLocalizedStringName(L"UnitName_Kilowatthour"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Kilowatthour"),
+                                       166,
+                                       true,
+                                       false,
+                                       false });
     energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilocalorie,
                                        GetLocalizedStringName(L"UnitName_Kilocalorie"),
                                        GetLocalizedStringName(L"UnitAbbreviation_Kilocalorie"),
@@ -830,6 +837,7 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_Kilocalorie, 4184 },
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_BritishThermalUnit, 1055.056 },
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_Kilojoule, 1000 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Kilowatthour, 3600000 },
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_ElectronVolt, 0.0000000000000000001602176565 },
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_Joule, 1 },
                                                    { ViewMode::Energy, UnitConverterUnits::Energy_FootPound, 1.3558179483314 },
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 5670daa9..5b994de9 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -1772,6 +1772,10 @@
   <data name="UnitAbbreviation_Joule" xml:space="preserve">
     <value>J</value>
     <comment>An abbreviation for a measurement unit of energy</comment>
+  </data>
+    <data name="UnitAbbreviation_Kilowatthour" xml:space="preserve">
+    <value>kWh</value>
+    <comment>An abbreviation for a measurement unit of electricity consumption</comment>
   </data>
   <data name="UnitAbbreviation_Kelvin" xml:space="preserve">
     <value>K</value>
@@ -2136,6 +2140,10 @@
   <data name="UnitName_Joule" xml:space="preserve">
     <value>Joules</value>
     <comment>A measurement unit for energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
+  </data>
+    <data name="UnitName_Kilowatthour" xml:space="preserve">
+    <value>Kilowatt-hours</value>
+    <comment>A measurement unit for electricity consumption. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitName_Kelvin" xml:space="preserve">
     <value>Kelvin</value>
diff --git a/src/CalculatorUnitTests/Test.resw b/src/CalculatorUnitTests/Test.resw
index d7c60508..5adc7e62 100644
--- a/src/CalculatorUnitTests/Test.resw
+++ b/src/CalculatorUnitTests/Test.resw
@@ -588,4 +588,7 @@
     <data name="Nanometers-Microns-3" xml:space="preserve">
     <value>0.003</value>
   </data>
+  <data name="Joules-Kilowatthour" xml:space="preserve">
+    <value>3600000</value>
+  </data>
 </root>