diff --git a/frontend/src/Utilities/Date/getRelativeDate.js b/frontend/src/Utilities/Date/getRelativeDate.js index 0a60135ce..812064272 100644 --- a/frontend/src/Utilities/Date/getRelativeDate.js +++ b/frontend/src/Utilities/Date/getRelativeDate.js @@ -4,6 +4,7 @@ import isInNextWeek from 'Utilities/Date/isInNextWeek'; import isToday from 'Utilities/Date/isToday'; import isTomorrow from 'Utilities/Date/isTomorrow'; import isYesterday from 'Utilities/Date/isYesterday'; +import translate from 'Utilities/String/translate'; function getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds = false, timeForToday = false } = {}) { if (!date) { @@ -21,15 +22,15 @@ function getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, } if (isYesterday(date)) { - return 'Yesterday'; + return translate('Yesterday'); } if (isTodayDate) { - return 'Today'; + return translate('Today'); } if (isTomorrow(date)) { - return 'Tomorrow'; + return translate('Tomorrow'); } if (isInNextWeek(date)) { diff --git a/frontend/src/Utilities/Date/isToday.js b/frontend/src/Utilities/Date/isToday.js index 31502951f..1e510e0a6 100644 --- a/frontend/src/Utilities/Date/isToday.js +++ b/frontend/src/Utilities/Date/isToday.js @@ -1,11 +1,12 @@ -import moment from 'moment'; - function isToday(date) { if (!date) { return false; } - return moment(date).isSame(moment(), 'day'); + const dateObj = (typeof date === 'object') ? date : new Date(date); + const today = new Date(); + + return dateObj.getDate() === today.getDate() && dateObj.getMonth() === today.getMonth() && dateObj.getFullYear() === today.getFullYear(); } export default isToday; diff --git a/frontend/src/Utilities/Date/isTomorrow.js b/frontend/src/Utilities/Date/isTomorrow.js index d22386dbd..4f2099af5 100644 --- a/frontend/src/Utilities/Date/isTomorrow.js +++ b/frontend/src/Utilities/Date/isTomorrow.js @@ -1,11 +1,13 @@ -import moment from 'moment'; - function isTomorrow(date) { if (!date) { return false; } - return moment(date).isSame(moment().add(1, 'day'), 'day'); + const dateObj = (typeof date === 'object') ? date : new Date(date); + const today = new Date(); + const tomorrow = new Date((today.setDate(today.getDate() + 1))); + + return dateObj.getDate() === tomorrow.getDate() && dateObj.getMonth() === tomorrow.getMonth() && dateObj.getFullYear() === tomorrow.getFullYear(); } export default isTomorrow; diff --git a/frontend/src/Utilities/Date/isYesterday.js b/frontend/src/Utilities/Date/isYesterday.js index 9de21d82a..b549b478d 100644 --- a/frontend/src/Utilities/Date/isYesterday.js +++ b/frontend/src/Utilities/Date/isYesterday.js @@ -1,11 +1,13 @@ -import moment from 'moment'; - function isYesterday(date) { if (!date) { return false; } - return moment(date).isSame(moment().subtract(1, 'day'), 'day'); + const dateObj = (typeof date === 'object') ? date : new Date(date); + const today = new Date(); + const yesterday = new Date((today.setDate(today.getDate() - 1))); + + return dateObj.getDate() === yesterday.getDate() && dateObj.getMonth() === yesterday.getMonth() && dateObj.getFullYear() === yesterday.getFullYear(); } export default isYesterday; diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 7e766cf9a..061b92695 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -751,6 +751,8 @@ "Titles": "Titles", "TMDBId": "TMDb Id", "TmdbIdHelpText": "The TMDb Id of the movie to exclude", + "Today": "Today", + "Tomorrow": "Tomorrow", "TorrentDelay": "Torrent Delay", "TorrentDelayHelpText": "Delay in minutes to wait before grabbing a torrent", "Torrents": "Torrents", @@ -842,5 +844,6 @@ "WhitelistedSubtitleTags": "Whitelisted Subtitle Tags", "Year": "Year", "YesCancel": "Yes, Cancel", + "Yesterday": "Yesterday", "YouCanAlsoSearch": "You can also search using TMDb ID or IMDb ID of a movie. eg. tmdb:71663" }