diff --git a/frontend/src/Movie/Details/MovieDetails.js b/frontend/src/Movie/Details/MovieDetails.js index 4e321c0175..33d8c73fe3 100644 --- a/frontend/src/Movie/Details/MovieDetails.js +++ b/frontend/src/Movie/Details/MovieDetails.js @@ -422,14 +422,15 @@ class MovieDetails extends Component {
{ - !!certification && + certification ? {certification} - + : + null } { - year > 0 && + year > 0 ? - + : + null } { - !!runtime && + runtime ? {formatRuntime(runtime, movieRuntimeFormat)} - + : + null } { diff --git a/frontend/src/Movie/Details/MovieReleaseDates.tsx b/frontend/src/Movie/Details/MovieReleaseDates.tsx index bc5ea0109a..ed5c490ed4 100644 --- a/frontend/src/Movie/Details/MovieReleaseDates.tsx +++ b/frontend/src/Movie/Details/MovieReleaseDates.tsx @@ -2,23 +2,25 @@ import React from 'react'; import { useSelector } from 'react-redux'; import Icon from 'Components/Icon'; import { icons } from 'Helpers/Props'; +import Movie from 'Movie/Movie'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; +import formatDate from 'Utilities/Date/formatDate'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import translate from 'Utilities/String/translate'; import styles from './MovieReleaseDates.css'; -interface MovieReleaseDatesProps { - inCinemas?: string; - digitalRelease?: string; - physicalRelease?: string; -} +type MovieReleaseDatesProps = Pick< + Movie, + 'inCinemas' | 'digitalRelease' | 'physicalRelease' +>; -function MovieReleaseDates(props: MovieReleaseDatesProps) { - const { inCinemas, digitalRelease, physicalRelease } = props; - - const { showRelativeDates, shortDateFormat, timeFormat } = useSelector( - createUISettingsSelector() - ); +function MovieReleaseDates({ + inCinemas, + digitalRelease, + physicalRelease, +}: MovieReleaseDatesProps) { + const { showRelativeDates, shortDateFormat, longDateFormat, timeFormat } = + useSelector(createUISettingsSelector()); if (!inCinemas && !physicalRelease && !digitalRelease) { return ( @@ -34,10 +36,16 @@ function MovieReleaseDates(props: MovieReleaseDatesProps) { return ( <> {inCinemas ? ( -
+
+ {getRelativeDate({ date: inCinemas, shortDateFormat, @@ -49,10 +57,16 @@ function MovieReleaseDates(props: MovieReleaseDatesProps) { ) : null} {digitalRelease ? ( -
+
+ {getRelativeDate({ date: digitalRelease, shortDateFormat, @@ -64,10 +78,16 @@ function MovieReleaseDates(props: MovieReleaseDatesProps) { ) : null} {physicalRelease ? ( -
+
+ {getRelativeDate({ date: physicalRelease, shortDateFormat, diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx b/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx index 02c97ae228..670f30a48f 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx +++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx @@ -22,6 +22,7 @@ import { Statistics } from 'Movie/Movie'; import MoviePoster from 'Movie/MoviePoster'; import { executeCommand } from 'Store/Actions/commandActions'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; +import formatDate from 'Utilities/Date/formatDate'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import translate from 'Utilities/String/translate'; import createMovieIndexItemSelector from '../createMovieIndexItemSelector'; @@ -243,7 +244,13 @@ function MovieIndexPoster(props: MovieIndexPosterProps) { ) : null} {showCinemaRelease && inCinemas ? ( -
+
{' '} {getRelativeDate({ date: inCinemas, @@ -256,7 +263,13 @@ function MovieIndexPoster(props: MovieIndexPosterProps) { ) : null} {showDigitalRelease && digitalRelease ? ( -
+
{' '} {getRelativeDate({ date: digitalRelease, @@ -269,7 +282,13 @@ function MovieIndexPoster(props: MovieIndexPosterProps) { ) : null} {showPhysicalRelease && physicalRelease ? ( -
+
{' '} {getRelativeDate({ date: physicalRelease, @@ -282,7 +301,13 @@ function MovieIndexPoster(props: MovieIndexPosterProps) { ) : null} {showReleaseDate && releaseDate ? ( -
+
{' '} {getRelativeDate({ date: releaseDate, diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx index 72269c8cce..42f7c12134 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx +++ b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx @@ -9,6 +9,7 @@ import { icons } from 'Helpers/Props'; import Language from 'Language/Language'; import { Ratings } from 'Movie/Movie'; import QualityProfile from 'typings/QualityProfile'; +import formatDate from 'Utilities/Date/formatDate'; import formatDateTime from 'Utilities/Date/formatDateTime'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import formatBytes from 'Utilities/Number/formatBytes'; @@ -139,7 +140,13 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) { }); return ( -
+
{inCinemasDate}
); @@ -155,7 +162,13 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) { }); return ( -
+
{digitalReleaseDate}
); @@ -175,7 +188,13 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) { }); return ( -
+
{physicalReleaseDate}
); @@ -183,7 +202,13 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) { if (sortKey === 'releaseDate' && releaseDate && !showReleaseDate) { return ( -
+
{' '} {getRelativeDate({ date: releaseDate,