Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-10-27 10:52:11 +01:00
Code Issues Projects Releases Wiki Activity

fixed TimeAgo abbreviation (#6977)

Browse Source 
* fixed TimeAgo abbreviation

* Update web/src/components/TimeAgo.tsx

Co-authored-by: Blake Blackshear <blakeb@blakeshome.com>

---------

Co-authored-by: Blake Blackshear <blakeb@blakeshome.com>
This commit is contained in:
Bernt Christian Egeland 2023-07-01 15:16:19 +02:00 committed by GitHub
parent 2f401bd8da
commit f1dc3a639c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/TimeAgo.tsx
View File

@ -25,9 +25,9 @@ const timeAgo = ({ time, currentTime = new Date(), dense = false }: IProp): stri
const elapsedTime: number = currentTime.getTime() - pastTime.getTime(); const elapsedTime: number = currentTime.getTime() - pastTime.getTime();
const timeUnits: TimeUnit[] = [ const timeUnits: TimeUnit[] = [
{ unit: 'ye', full: 'year', value: 31536000 }, { unit: 'yr', full: 'year', value: 31536000 },
{ unit: 'mo', full: 'month', value: 0 }, { unit: 'mo', full: 'month', value: 0 },
{ unit: 'day', full: 'day', value: 86400 }, { unit: 'd', full: 'day', value: 86400 },
{ unit: 'h', full: 'hour', value: 3600 }, { unit: 'h', full: 'hour', value: 3600 },
{ unit: 'm', full: 'minute', value: 60 }, { unit: 'm', full: 'minute', value: 60 },
{ unit: 's', full: 'second', value: 1 }, { unit: 's', full: 'second', value: 1 },
@ -58,11 +58,11 @@ const timeAgo = ({ time, currentTime = new Date(), dense = false }: IProp): stri
if (monthDiff > 0) { if (monthDiff > 0) {
const unitAmount = monthDiff; const unitAmount = monthDiff;
return `${unitAmount}${dense ? timeUnits[i].unit[0] : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`; return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`;
} }
} else if (elapsed >= timeUnits[i].value) { } else if (elapsed >= timeUnits[i].value) {
const unitAmount: number = Math.floor(elapsed / timeUnits[i].value); const unitAmount: number = Math.floor(elapsed / timeUnits[i].value);
return `${unitAmount}${dense ? timeUnits[i].unit[0] : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`; return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`;
} }
} }
return 'Invalid Time'; return 'Invalid Time';