@@ -169,15 +163,13 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
physicalRelease &&
!showPhysicalRelease
) {
- const physicalReleaseDate = getRelativeDate(
- physicalRelease,
+ const physicalReleaseDate = getRelativeDate({
+ date: physicalRelease,
shortDateFormat,
showRelativeDates,
- {
- timeFormat,
- timeForToday: false,
- }
- );
+ timeFormat,
+ timeForToday: false,
+ });
return (
@@ -190,7 +182,10 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
return (
{' '}
- {getRelativeDate(releaseDate, shortDateFormat, showRelativeDates, {
+ {getRelativeDate({
+ date: releaseDate,
+ shortDateFormat,
+ showRelativeDates,
timeFormat,
timeForToday: false,
})}
diff --git a/frontend/src/Utilities/Date/getRelativeDate.js b/frontend/src/Utilities/Date/getRelativeDate.js
deleted file mode 100644
index 812064272..000000000
--- a/frontend/src/Utilities/Date/getRelativeDate.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import moment from 'moment';
-import formatTime from 'Utilities/Date/formatTime';
-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) {
- return null;
- }
-
- const isTodayDate = isToday(date);
-
- if (isTodayDate && timeForToday && timeFormat) {
- return formatTime(date, timeFormat, { includeMinuteZero: true, includeSeconds });
- }
-
- if (!showRelativeDates) {
- return moment(date).format(shortDateFormat);
- }
-
- if (isYesterday(date)) {
- return translate('Yesterday');
- }
-
- if (isTodayDate) {
- return translate('Today');
- }
-
- if (isTomorrow(date)) {
- return translate('Tomorrow');
- }
-
- if (isInNextWeek(date)) {
- return moment(date).format('dddd');
- }
-
- return moment(date).format(shortDateFormat);
-}
-
-export default getRelativeDate;
diff --git a/frontend/src/Utilities/Date/getRelativeDate.ts b/frontend/src/Utilities/Date/getRelativeDate.ts
new file mode 100644
index 000000000..509f1f39d
--- /dev/null
+++ b/frontend/src/Utilities/Date/getRelativeDate.ts
@@ -0,0 +1,82 @@
+import moment from 'moment';
+import formatTime from 'Utilities/Date/formatTime';
+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';
+import formatDateTime from './formatDateTime';
+
+interface GetRelativeDateOptions {
+ date?: string;
+ shortDateFormat: string;
+ showRelativeDates: boolean;
+ timeFormat?: string;
+ includeSeconds?: boolean;
+ timeForToday?: boolean;
+ includeTime?: boolean;
+}
+
+function getRelativeDate({
+ date,
+ shortDateFormat,
+ showRelativeDates,
+ timeFormat,
+ includeSeconds = false,
+ timeForToday = false,
+ includeTime = false,
+}: GetRelativeDateOptions) {
+ if (!date) {
+ return '';
+ }
+
+ if ((includeTime || timeForToday) && !timeFormat) {
+ throw new Error(
+ "getRelativeDate: 'timeFormat' is required when 'includeTime' or 'timeForToday' is true"
+ );
+ }
+
+ const isTodayDate = isToday(date);
+ const time = timeFormat
+ ? formatTime(date, timeFormat, {
+ includeMinuteZero: true,
+ includeSeconds,
+ })
+ : '';
+
+ if (isTodayDate && timeForToday) {
+ return time;
+ }
+
+ if (!showRelativeDates) {
+ return moment(date).format(shortDateFormat);
+ }
+
+ if (isYesterday(date)) {
+ return includeTime
+ ? translate('YesterdayAt', { time })
+ : translate('Yesterday');
+ }
+
+ if (isTodayDate) {
+ return includeTime ? translate('TodayAt', { time }) : translate('Today');
+ }
+
+ if (isTomorrow(date)) {
+ return includeTime
+ ? translate('TomorrowAt', { time })
+ : translate('Tomorrow');
+ }
+
+ if (isInNextWeek(date)) {
+ const day = moment(date).format('dddd');
+
+ return includeTime ? translate('DayOfWeekAt', { day, time }) : day;
+ }
+
+ return includeTime
+ ? formatDateTime(date, shortDateFormat, timeFormat, { includeSeconds })
+ : moment(date).format(shortDateFormat);
+}
+
+export default getRelativeDate;
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index a0b60bea1..468b1e186 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -278,6 +278,7 @@
"Date": "Date",
"Dates": "Dates",
"Day": "Day",
+ "DayOfWeekAt": "{day} at {time}",
"Days": "Days",
"Debug": "Debug",
"Default": "Default",
@@ -1696,7 +1697,9 @@
"TmdbRating": "TMDb Rating",
"TmdbVotes": "TMDb Votes",
"Today": "Today",
+ "TodayAt": "Today at {time}",
"Tomorrow": "Tomorrow",
+ "TomorrowAt": "Tomorrow at {time}",
"TorrentBlackhole": "Torrent Blackhole",
"TorrentBlackholeSaveMagnetFiles": "Save Magnet Files",
"TorrentBlackholeSaveMagnetFilesExtension": "Save Magnet Files Extension",
@@ -1811,5 +1814,6 @@
"YesCancel": "Yes, Cancel",
"YesMoveFiles": "Yes, Move the Files",
"Yesterday": "Yesterday",
+ "YesterdayAt": "Yesterday at {time}",
"YouCanAlsoSearch": "You can also search using TMDb ID or IMDb ID of a movie. e.g. `tmdb:71663`"
}