fix #1649

one of the goals of my pull request, besides simplifying the code was to have localization. It's nice that the browser can handle this, but for consistency, we'll go with vue-i18n since it is already available
tbnobody · Jan 18, 2024 · f26e824 · f26e824
1 parent 6233ad1
commit f26e824
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/webapp/src/components/EventLog.vue b/webapp/src/components/EventLog.vue
@@ -31,7 +31,7 @@ export default defineComponent({
     computed: {
         timeInHours() {
             return (value: number) => {
-                return timestampToString(value);
+                return timestampToString(this.$i18n.locale, value)[0];
             };
         },
     },

diff --git a/webapp/src/components/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue
@@ -49,7 +49,7 @@
                     </tr>
                     <tr>
                         <th>{{ $t('firmwareinfo.Uptime') }}</th>
-                        <td>{{ timeInHours(systemStatus.uptime) }}</td>
+                        <td>{{ $t('firmwareinfo.UptimeValue', timeInHours(systemStatus.uptime)) }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -73,7 +73,8 @@ export default defineComponent({
     computed: {
         timeInHours() {
             return (value: number) => {
-                return timestampToString(value, true);
+                const [count, time] = timestampToString(this.$i18n.locale, value, true);
+                return {count, time};
             };
         },
         versionInfoUrl(): string {

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -188,7 +188,8 @@
         "ResetReason0": "Reset Grund CPU 0",
         "ResetReason1": "Reset Grund CPU 1",
         "ConfigSaveCount": "Anzahl der Konfigurationsspeicherungen",
-        "Uptime": "Betriebszeit"
+        "Uptime": "Betriebszeit",
+        "UptimeValue": "0 Tage {time} | 1 Tag {time} | {count} Tage {time}"
     },
     "hardwareinfo": {
         "HardwareInformation": "Hardwareinformationen",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -188,7 +188,8 @@
         "ResetReason0": "Reset Reason CPU 0",
         "ResetReason1": "Reset Reason CPU 1",
         "ConfigSaveCount": "Config save count",
-        "Uptime": "Uptime"
+        "Uptime": "Uptime",
+        "UptimeValue": "0 days {time} | 1 day {time} | {count} days {time}"
     },
     "hardwareinfo": {
         "HardwareInformation": "Hardware Information",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -188,7 +188,8 @@
         "ResetReason0": "Raison de la réinitialisation CPU 0",
         "ResetReason1": "Raison de la réinitialisation CPU 1",
         "ConfigSaveCount": "Nombre d'enregistrements de la configuration",
-        "Uptime": "Temps de fonctionnement"
+        "Uptime": "Durée de fonctionnement",
+        "UptimeValue": "0 jour {time} | 1 jour {time} | {count} jours {time}"
     },
     "hardwareinfo": {
         "HardwareInformation": "Informations sur le matériel",
@@ -616,4 +617,4 @@
         "ValueSelected": "Sélectionné",
         "ValueActive": "Activé"
     }
-}
+}
diff --git a/webapp/src/utils/time.ts b/webapp/src/utils/time.ts
@@ -1,8 +1,8 @@
-export const timestampToString = (timestampSeconds: number, includeDays = false): string => {
-    const timeString = new Date(timestampSeconds * 1000).toLocaleTimeString([], { timeZone: "UTC" });
-    if (!includeDays) return timeString;
+export const timestampToString = (locale: string, timestampSeconds: number, includeDays = false): string[] => {
+    const timeString = new Date(timestampSeconds * 1000).toLocaleTimeString(locale, { timeZone: "UTC", hour12: false });
+    if (!includeDays) return [timeString];
 
     const secondsPerDay = 60 * 60 * 24;
-    const days = Math.floor(timestampSeconds / secondsPerDay);
-    return new Intl.RelativeTimeFormat().format(-days, "day") + " " + timeString;
+    const days = Math.floor(timestampSeconds / secondsPerDay).toFixed(0);
+    return [days, timeString];
 }