Fix locale time formatting

traccar · Jul 30, 2024 · b77092b · b77092b
1 parent f164e72
commit b77092b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/common/util/formatter.js b/src/common/util/formatter.js
@@ -33,16 +33,19 @@ export const formatConsumption = (value, t) => `${value.toFixed(2)} ${t('sharedL
 
 export const formatTime = (value, format) => {
   if (value) {
-    const d = dayjs(value);
+    const d = dayjs(value).toDate();
+    const dateConfig = { year: 'numeric', month: '2-digit', day: '2-digit' };
+    const minuteConfig = { hour: '2-digit', minute: '2-digit' };
+    const secondConfig = { ...minuteConfig, second: '2-digit' };
     switch (format) {
       case 'date':
-        return d.format('L');
+        return d.toLocaleDateString(undefined, dateConfig);
       case 'time':
-        return d.format('LTS');
+        return d.toLocaleTimeString(undefined, secondConfig);
       case 'minutes':
-        return d.format('L LT');
+        return d.toLocaleString(undefined, { ...dateConfig, ...minuteConfig });
       default:
-        return d.format('L LTS');
+        return d.toLocaleString(undefined, { ...dateConfig, ...secondConfig });
     }
   }
   return '';