Use correct units in hardware info

tbnobody · May 28, 2024 · df80953 · df80953
1 parent 6ce4740
commit df80953
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/webapp/src/components/HardwareInfo.vue b/webapp/src/components/HardwareInfo.vue
@@ -21,13 +21,13 @@
                     </tr>
                     <tr>
                         <th>{{ $t('hardwareinfo.CpuTemperature') }}</th>
-                        <td>{{ $n(systemStatus.cputemp, 'decimalNoDigits') }} {{ $t('hardwareinfo.DegreeC') }}</td>
+                        <td>{{ $n(systemStatus.cputemp, 'celsius') }}</td>
                     </tr>
                     <tr>
                         <th>{{ $t('hardwareinfo.FlashSize') }}</th>
                         <td>
-                            {{ $n(systemStatus.flashsize) }} {{ $t('hardwareinfo.Bytes') }}
-                            ({{ $n(systemStatus.flashsize / 1024 / 1024) }} {{ $t('hardwareinfo.MegaBytes') }})
+                            {{ $n(systemStatus.flashsize, 'byte') }}
+                            ({{ $n(systemStatus.flashsize / 1024 / 1024, 'megabyte') }})
                         </td>
                     </tr>
                 </tbody>

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -205,9 +205,7 @@
         "Mhz": "MHz",
         "CpuTemperature": "CPU Temperatur",
         "DegreeC": "°C",
-        "FlashSize": "Flash-Speichergröße",
-        "Bytes": "Bytes",
-        "MegaBytes": "MB"
+        "FlashSize": "Flash-Speichergröße"
     },
     "memoryinfo": {
         "MemoryInformation": "Speicherinformationen",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -205,9 +205,7 @@
         "Mhz": "MHz",
         "CpuTemperature": "CPU Temperature",
         "DegreeC": "°C",
-        "FlashSize": "Flash Memory Size",
-        "Bytes": "Bytes",
-        "MegaBytes": "MB"
+        "FlashSize": "Flash Memory Size"
     },
     "memoryinfo": {
         "MemoryInformation": "Memory Information",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -205,9 +205,7 @@
         "Mhz": "MHz",
         "CpuTemperature": "CPU Temperature",
         "DegreeC": "°C",
-        "FlashSize": "Taille de la mémoire flash",
-        "Bytes": "octets",
-        "MegaBytes": "Mo"
+        "FlashSize": "Taille de la mémoire flash"
     },
     "memoryinfo": {
         "MemoryInformation": "Informations sur la mémoire",

diff --git a/webapp/src/locales/index.ts b/webapp/src/locales/index.ts
@@ -62,9 +62,18 @@ export const numberFormats: I18nOptions["numberFormats"] = {
         percent: {
             style: 'percent',
         },
+        byte: {
+            style: 'unit', unit: 'byte',
+        },
         kilobyte: {
             style: 'unit', unit: 'kilobyte',
         },
+        megabyte: {
+            style: 'unit', unit: 'megabyte',
+        },
+        celsius: {
+            style: 'unit', unit: 'celsius', maximumFractionDigits: 1,
+        },
     },
     [Locales.DE]: {
         decimal: {
@@ -79,9 +88,18 @@ export const numberFormats: I18nOptions["numberFormats"] = {
         percent: {
             style: 'percent',
         },
+        byte: {
+            style: 'unit', unit: 'byte',
+        },
         kilobyte: {
             style: 'unit', unit: 'kilobyte',
         },
+        megabyte: {
+            style: 'unit', unit: 'megabyte',
+        },
+        celsius: {
+            style: 'unit', unit: 'celsius', maximumFractionDigits: 1,
+        },
     },
     [Locales.FR]: {
         decimal: {
@@ -96,10 +114,19 @@ export const numberFormats: I18nOptions["numberFormats"] = {
         percent: {
           style: 'percent',
         },
+        byte: {
+            style: 'unit', unit: 'byte',
+        },
         kilobyte: {
             style: 'unit', unit: 'kilobyte',
         },
+        megabyte: {
+            style: 'unit', unit: 'megabyte',
+        },
+        celsius: {
+            style: 'unit', unit: 'celsius', maximumFractionDigits: 1,
+        },
     },
 };
 
-export const defaultLocale = Locales.EN;
+export const defaultLocale = Locales.EN;