jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Cleanup prettyDate filter

Browse Source
This commit is contained in:
Johannes Zellner
2023-03-24 10:54:14 +01:00
parent a98588d924
commit 7410933f6e
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dashboard/src/js/client.js
View File

@@ -307,18 +307,10 @@ angular.module('Application').filter('prettyDate', function ($translate) {
if (isNaN(day_diff) || day_diff < 0) return $translate.instant('main.prettyDate.justNow', {});
return day_diff === 0 && (
diff < 60 && $translate.instant('main.prettyDate.justNow', {}) ||
diff < 120 && $translate.instant('main.prettyDate.minutesAgo', { m: 1 }) ||
diff < 3600 && $translate.instant('main.prettyDate.minutesAgo', { m: Math.floor( diff / 60 ) }) ||
diff < 7200 && $translate.instant('main.prettyDate.hoursAgo', { h: 1 }) ||
diff < 86400 && $translate.instant('main.prettyDate.hoursAgo', { h: Math.floor( diff / 3600 ) })
) ||
return day_diff === 0 && (diff < 60 && $translate.instant('main.prettyDate.justNow', {}) ||
moment(utc).format('hh:mm:ss')) ||
day_diff === 1 && $translate.instant('main.prettyDate.yeserday', {}) ||
day_diff < 7 && $translate.instant('main.prettyDate.daysAgo', { d: day_diff }) ||
day_diff < 31 && $translate.instant('main.prettyDate.weeksAgo', { w: Math.ceil( day_diff / 7 ) }) ||
day_diff < 365 && $translate.instant('main.prettyDate.monthsAgo', { m: Math.round( day_diff / 30 ) }) ||
$translate.instant('main.prettyDate.yearsAgo', { m: Math.round( day_diff / 365 ) });
moment(utc).format('D MMM YY');
};
});
@@ -330,7 +322,7 @@ angular.module('Application').filter('prettyFutureDate', function () {
angular.module('Application').filter('prettyLongDate', function () {
return function prettyLongDate(utc) {
return moment(utc).format('MMMM Do YYYY, h:mm:ss a'); // this converts utc into browser timezone and not cloudron timezone!
return moment(utc).format('DD MMMM YYYY, hh:mm:ss'); // this converts utc into browser timezone and not cloudron timezone!
};
});