watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Brian Cao 2023-08-15 10:57:34 -07:00
commit 14df1e5a29
9 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/date.js
View file

@ -250,9 +250,13 @@ export const customFormats = {
};
export function dateFormat(date, str, locale = 'en-US') {
return format(date, customFormats?.[locale]?.[str] || str, {
locale: getDateLocale(locale),
});
return format(
typeof date === 'string' ? new Date(date) : date,
customFormats?.[locale]?.[str] || str,
{
locale: getDateLocale(locale),
},
);
}
export function maxDate(...args) {