diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-06-14 21:01:24 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-06-14 21:01:24 -0600 |
commit | e9cdc61de90ef44dc2edd1c82d10f2f29803715e (patch) | |
tree | a1a06704904d4322396908ff93881b2d61af2669 /src/common/util | |
parent | 1a7f95baad1939589e6a23bd31b42b8e094a736a (diff) | |
parent | e4840d26a26dd298dbd97be74373b85607a84add (diff) | |
download | trackermap-web-e9cdc61de90ef44dc2edd1c82d10f2f29803715e.tar.gz trackermap-web-e9cdc61de90ef44dc2edd1c82d10f2f29803715e.tar.bz2 trackermap-web-e9cdc61de90ef44dc2edd1c82d10f2f29803715e.zip |
Merge tag 'v6.2'
Diffstat (limited to 'src/common/util')
-rw-r--r-- | src/common/util/formatter.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/common/util/formatter.js b/src/common/util/formatter.js index 7b7fc96d..b10d737a 100644 --- a/src/common/util/formatter.js +++ b/src/common/util/formatter.js @@ -1,6 +1,7 @@ import dayjs from 'dayjs'; import duration from 'dayjs/plugin/duration'; import relativeTime from 'dayjs/plugin/relativeTime'; +import localizedFormat from 'dayjs/plugin/localizedFormat'; import { altitudeFromMeters, @@ -16,6 +17,7 @@ import { prefixString } from './stringUtils'; dayjs.extend(duration); dayjs.extend(relativeTime); +dayjs.extend(localizedFormat); export const formatBoolean = (value, t) => (value ? t('sharedYes') : t('sharedNo')); @@ -23,24 +25,24 @@ export const formatNumber = (value, precision = 1) => Number(value.toFixed(preci export const formatPercentage = (value) => `${value}%`; -export const formatTemperature = (value) => `${value}°C`; +export const formatTemperature = (value) => `${value.toFixed(1)}°C`; -export const formatVoltage = (value, t) => `${value} ${t('sharedVoltAbbreviation')}`; +export const formatVoltage = (value, t) => `${value.toFixed(2)} ${t('sharedVoltAbbreviation')}`; -export const formatConsumption = (value, t) => `${value} ${t('sharedLiterPerHourAbbreviation')}`; +export const formatConsumption = (value, t) => `${value.toFixed(2)} ${t('sharedLiterPerHourAbbreviation')}`; -export const formatTime = (value, format, hours12) => { +export const formatTime = (value, format) => { if (value) { const d = dayjs(value); switch (format) { case 'date': - return d.format('YYYY-MM-DD'); + return d.format('L'); case 'time': - return d.format(hours12 ? 'hh:mm:ss A' : 'HH:mm:ss'); + return d.format('LTS'); case 'minutes': - return d.format(hours12 ? 'YYYY-MM-DD hh:mm A' : 'YYYY-MM-DD HH:mm'); + return d.format('L LT'); default: - return d.format(hours12 ? 'YYYY-MM-DD hh:mm:ss A' : 'YYYY-MM-DD HH:mm:ss'); + return d.format('L LTS'); } } return ''; |