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

Maybe fix time date display for good

Browse Source
This commit is contained in:
Johannes Zellner
2023-04-15 19:00:01 +02:00
parent eeda0a2868
commit e6f870b220
8 changed files with 28 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,9 +309,9 @@ 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', {}) ||
moment(utc).format('HH:mm:ss')) ||
moment(utc).locale(navigator.language).format('LT')) ||
day_diff === 1 && $translate.instant('main.prettyDate.yeserday', {}) ||
moment(utc).format('D MMM YY');
moment(utc).locale(navigator.language).format('L');
};
});
@@ -323,13 +323,13 @@ angular.module('Application').filter('prettyFutureDate', function () {
angular.module('Application').filter('prettyLongDate', function () {
return function prettyLongDate(utc) {
return moment(utc).format('DD MMMM YYYY, HH:mm:ss'); // this converts utc into browser timezone and not cloudron timezone!
return moment(utc).locale(navigator.language).format('LLL'); // this converts utc into browser timezone and not cloudron timezone!
};
});
angular.module('Application').filter('prettyShortDate', function () {
return function prettyShortDate(utc) {
return moment(utc).format('MMMM Do YYYY'); // this converts utc into browser timezone and not cloudron timezone!
return moment(utc).locale(navigator.language).format('L'); // this converts utc into browser timezone and not cloudron timezone!
};
});