From 39d11b46696d14b898edffdbd91db3b4be3e1eaf Mon Sep 17 00:00:00 2001
From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>
Date: Sun, 24 Jan 2021 22:46:33 +0000
Subject: [PATCH] replaced words with icons and matched the sort for
consistency
---
.../Movie/Index/Posters/MovieIndexPoster.js | 24 +++++++++++++++----
.../Index/Posters/MovieIndexPosterInfo.js | 14 ++++++++---
2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js
index 62d0fa371..c8d1f9dcc 100644
--- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js
@@ -275,7 +275,9 @@ class MovieIndexPoster extends Component {
{
showCinemaRelease && inCinemas &&
- {translate('InCinemas')}: {getRelativeDate(
+
{getRelativeDate(
inCinemas,
shortDateFormat,
showRelativeDates,
@@ -288,16 +290,28 @@ class MovieIndexPoster extends Component {
}
{
- showCinemaRelease && !inCinemas &&
+ showReleaseDate && releaseDateType === 'Released' &&
- {translate('NoCinemaRelease')}
+ {getRelativeDate(
+ releaseDate,
+ shortDateFormat,
+ showRelativeDates,
+ {
+ timeFormat,
+ timeForToday: false
+ }
+ )}
}
{
- showReleaseDate &&
+ showReleaseDate && releaseDateType === 'Digital' &&
- {translate(releaseDateType)}: {getRelativeDate(
+
{getRelativeDate(
releaseDate,
shortDateFormat,
showRelativeDates,
diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js
index 0d0e47350..33af9e33b 100644
--- a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js
@@ -1,5 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
+import Icon from 'Components/Icon';
+import { icons } from 'Helpers/Props';
import getRelativeDate from 'Utilities/Date/getRelativeDate';
import formatBytes from 'Utilities/Number/formatBytes';
import translate from 'Utilities/String/translate';
@@ -71,7 +73,9 @@ function MovieIndexPosterInfo(props) {
return (
- {translate('InCinemas')}: {inCinemasDate}
+ {inCinemasDate}
);
}
@@ -89,7 +93,9 @@ function MovieIndexPosterInfo(props) {
return (
- {translate('Digital')}: {digitalReleaseDate}
+ {digitalReleaseDate}
);
}
@@ -107,7 +113,9 @@ function MovieIndexPosterInfo(props) {
return (
- {translate('Released')}: {physicalReleaseDate}
+ {physicalReleaseDate}
);
}