diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index caa304c57..00763cc48 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -527,11 +527,11 @@ function buildRequestContext(result, type) { year: result.releaseYear, type: type, status: result.status, - releaseDate: moment.duration(moment() - moment(result.releaseDate).local()).humanize() + ' ago', + releaseDate: Humanize(result.releaseDate), releaseDateTicks: result.releaseDateTicks, approved: result.approved, requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '', - requestedDate: moment.duration(moment() - moment(result.requestedDate).local()).humanize() + ' ago', + requestedDate: Humanize(result.requestedDate), requestedDateTicks: result.requestedDateTicks, available: result.available, admin: result.admin, diff --git a/PlexRequests.UI/Content/site.js b/PlexRequests.UI/Content/site.js index 69602d059..e2784b315 100644 --- a/PlexRequests.UI/Content/site.js +++ b/PlexRequests.UI/Content/site.js @@ -8,6 +8,12 @@ return s; } +function Humanize(date) { + var mNow = moment(); + var mDate = moment(date).local(); + return moment.duration(mNow - mDate).humanize() + (mNow.isBefore(mDate) ? ' from now' : ' ago'); +} + function generateNotify(message, type) { // type = danger, warning, info, successs $.notify({