);
@@ -102,8 +106,8 @@ function DiscoverMoviePosterInfo(props) {
if (sortKey === 'runtime' && runtime) {
return (
-
- {formatRuntime(runtime)}
+
+ {formatRuntime(runtime, movieRuntimeFormat)}
);
}
@@ -111,9 +115,7 @@ function DiscoverMoviePosterInfo(props) {
if (sortKey === 'ratings' && ratings) {
return (
-
+
);
}
@@ -133,7 +135,8 @@ DiscoverMoviePosterInfo.propTypes = {
sortKey: PropTypes.string.isRequired,
showRelativeDates: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired,
- timeFormat: PropTypes.string.isRequired
+ timeFormat: PropTypes.string.isRequired,
+ movieRuntimeFormat: PropTypes.string.isRequired
};
export default DiscoverMoviePosterInfo;
diff --git a/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js b/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
index 47f914324..9eba81850 100644
--- a/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
+++ b/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
@@ -76,6 +76,7 @@ class DiscoverMovieRow extends Component {
ratings,
popularity,
certification,
+ movieRuntimeFormat,
collection,
columns,
isExisting,
@@ -230,7 +231,7 @@ class DiscoverMovieRow extends Component {
key={name}
className={styles[name]}
>
- {formatRuntime(runtime)}
+ {formatRuntime(runtime, movieRuntimeFormat)}
);
}
@@ -397,6 +398,7 @@ DiscoverMovieRow.propTypes = {
popularity: PropTypes.number.isRequired,
certification: PropTypes.string,
collection: PropTypes.object,
+ movieRuntimeFormat: PropTypes.string.isRequired,
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
isExisting: PropTypes.bool.isRequired,
isExcluded: PropTypes.bool.isRequired,
diff --git a/frontend/src/DiscoverMovie/Table/DiscoverMovieRowConnector.js b/frontend/src/DiscoverMovie/Table/DiscoverMovieRowConnector.js
index 5d54eafc5..d799de22b 100644
--- a/frontend/src/DiscoverMovie/Table/DiscoverMovieRowConnector.js
+++ b/frontend/src/DiscoverMovie/Table/DiscoverMovieRowConnector.js
@@ -5,9 +5,11 @@ import DiscoverMovieRow from './DiscoverMovieRow';
function createMapStateToProps() {
return createSelector(
+ (state) => state.settings.ui.item.movieRuntimeFormat,
createDimensionsSelector(),
- (dimensions) => {
+ (movieRuntimeFormat, dimensions) => {
return {
+ movieRuntimeFormat,
isSmallScreen: dimensions.isSmallScreen
};
}