From 0931dfc5b104220fc2d17ee2ff71eec48b11ecf1 Mon Sep 17 00:00:00 2001
From: Joshua Taillon <jat255@gmail.com>
Date: Mon, 7 Nov 2022 14:52:21 -0700
Subject: [PATCH] Customize weather temperature display based on unit setting

---
 .../Workout/WorkoutDetail/WorkoutWeather.vue         | 12 ++++++++++--
 fittrackee_client/src/locales/de/user.json           |  4 ++--
 fittrackee_client/src/locales/en/user.json           |  6 +++---
 fittrackee_client/src/locales/fr/user.json           |  6 +++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutWeather.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutWeather.vue
index 83863f5e..fc4fab4f 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutWeather.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutWeather.vue
@@ -58,10 +58,14 @@
             />
           </td>
           <td>
-            {{ Number(workoutObject.weatherStart.temperature).toFixed(1) }}°C
+            {{ useImperialUnits ?
+                convertCelsiusToFahrenheit(Number(workoutObject.weatherStart.temperature)).toFixed(1) + " °F" :
+                Number(workoutObject.weatherStart.temperature).toFixed(1) + " °C"}}
           </td>
           <td>
-            {{ Number(workoutObject.weatherEnd.temperature).toFixed(1) }}°C
+            {{ useImperialUnits ?
+                convertCelsiusToFahrenheit(Number(workoutObject.weatherEnd.temperature)).toFixed(1) + " °F" :
+                Number(workoutObject.weatherEnd.temperature).toFixed(1) + " °C"}}
           </td>
         </tr>
         <tr>
@@ -120,6 +124,10 @@
   const props = defineProps<Props>()
 
   const { useImperialUnits, workoutObject } = toRefs(props)
+
+  function convertCelsiusToFahrenheit(celsius_temp: number): number {
+    return celsius_temp * 1.8 + 32
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/fittrackee_client/src/locales/de/user.json b/fittrackee_client/src/locales/de/user.json
index 6d3beaa6..93b82c45 100644
--- a/fittrackee_client/src/locales/de/user.json
+++ b/fittrackee_client/src/locales/de/user.json
@@ -94,8 +94,8 @@
         "SUCCESSFUL_UPDATE": "Dein Konto wurde erfolgreich aktualisiert.",
         "UNITS": {
             "LABEL": "Einheiten für die Distanz",
-            "IMPERIAL": "Imperiales System (ft, mi)",
-            "METRIC": "Metrisches System (m, km)"
+            "IMPERIAL": "Imperiales System (ft, mi, °F)",
+            "METRIC": "Metrisches System (m, km, °C)"
         },
         "TIMEZONE": "Zeitzone"
     },
diff --git a/fittrackee_client/src/locales/en/user.json b/fittrackee_client/src/locales/en/user.json
index 66987cb8..95bc3172 100644
--- a/fittrackee_client/src/locales/en/user.json
+++ b/fittrackee_client/src/locales/en/user.json
@@ -94,8 +94,8 @@
     "SUCCESSFUL_UPDATE": "Your account has been updated successfully.",
     "UNITS": {
       "LABEL": "Units for distance",
-      "IMPERIAL": "Imperial system (ft, mi)",
-      "METRIC": "Metric system (m, km)"
+      "IMPERIAL": "Imperial system (ft, mi, °F)",
+      "METRIC": "Metric system (m, km, °C)"
     },
     "TIMEZONE": "Timezone"
   },
@@ -108,4 +108,4 @@
   "USER_PICTURE": "user picture",
   "USERNAME": "Username",
   "USERNAME_INFO": "3 to 30 characters required, only alphanumeric characters and the underscore character \"_\" allowed."
-}
+}
\ No newline at end of file
diff --git a/fittrackee_client/src/locales/fr/user.json b/fittrackee_client/src/locales/fr/user.json
index 6841763c..c196b772 100644
--- a/fittrackee_client/src/locales/fr/user.json
+++ b/fittrackee_client/src/locales/fr/user.json
@@ -82,8 +82,8 @@
         },
         "UNITS": {
             "LABEL": "Unités pour les distances",
-            "IMPERIAL": "Système impérial (ft, mi)",
-            "METRIC": "Système métrique (m, km)"
+            "IMPERIAL": "Système impérial (ft, mi, °F)",
+            "METRIC": "Système métrique (m, km, °C)"
         },
         "SPORT": {
             "ACTION": "action",
@@ -108,4 +108,4 @@
     "USER_PICTURE": "photo de l'utilisateur",
     "USERNAME": "Nom d'utilisateur",
     "USERNAME_INFO": "3 à 30 caractères requis, seuls les caractères alphanumériques et le caractère _ sont autorisés."
-}
+}
\ No newline at end of file