From 67b4182f4d2779fd74ebd2d74f6d483d39876f9f Mon Sep 17 00:00:00 2001 From: nitsua Date: Sun, 2 Aug 2020 00:43:57 -0400 Subject: [PATCH] Fixed: OriginalTitle in the API using the Title New: Change tooltip (title) on movie details to original title --- frontend/src/Components/Marquee.js | 6 ++++-- frontend/src/Movie/Details/MovieDetails.js | 4 +++- src/Radarr.Api.V3/Movies/MovieResource.cs | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/frontend/src/Components/Marquee.js b/frontend/src/Components/Marquee.js index ffe4da48a..900ccafd6 100644 --- a/frontend/src/Components/Marquee.js +++ b/frontend/src/Components/Marquee.js @@ -9,6 +9,7 @@ class Marquee extends Component { static propTypes = { text: PropTypes.string, + title: PropTypes.string, hoverToStop: PropTypes.bool, loop: PropTypes.bool, className: PropTypes.string @@ -16,6 +17,7 @@ class Marquee extends Component { static defaultProps = { text: '', + title: '', hoverToStop: true, loop: false }; @@ -144,7 +146,7 @@ class Marquee extends Component { this.text = el; }} style={style} - title={this.props.text} + title={(this.props.title && (this.props.text !== this.props.title)) ? `Original Title: ${this.props.title}` : this.props.text} > {this.props.text} @@ -167,7 +169,7 @@ class Marquee extends Component { this.text = el; }} style={style} - title={this.props.text} + title={(this.props.title && (this.props.text !== this.props.title)) ? `Original Title: ${this.props.title}` : this.props.text} > {this.props.text} diff --git a/frontend/src/Movie/Details/MovieDetails.js b/frontend/src/Movie/Details/MovieDetails.js index a286a193a..d4825d429 100644 --- a/frontend/src/Movie/Details/MovieDetails.js +++ b/frontend/src/Movie/Details/MovieDetails.js @@ -235,6 +235,7 @@ class MovieDetails extends Component { tmdbId, imdbId, title, + originalTitle, year, inCinemas, physicalRelease, @@ -370,7 +371,7 @@ class MovieDetails extends Component {
- + @@ -736,6 +737,7 @@ MovieDetails.propTypes = { tmdbId: PropTypes.number.isRequired, imdbId: PropTypes.string, title: PropTypes.string.isRequired, + originalTitle: PropTypes.string, year: PropTypes.number.isRequired, runtime: PropTypes.number.isRequired, certification: PropTypes.string, diff --git a/src/Radarr.Api.V3/Movies/MovieResource.cs b/src/Radarr.Api.V3/Movies/MovieResource.cs index 78abee3d9..988e19bce 100644 --- a/src/Radarr.Api.V3/Movies/MovieResource.cs +++ b/src/Radarr.Api.V3/Movies/MovieResource.cs @@ -91,7 +91,7 @@ public static MovieResource ToResource(this Movie model) Id = model.Id, TmdbId = model.TmdbId, Title = model.Title, - OriginalTitle = model.Title, + OriginalTitle = model.OriginalTitle, SortTitle = model.SortTitle, InCinemas = model.InCinemas, PhysicalRelease = model.PhysicalRelease, @@ -154,7 +154,7 @@ public static MovieResource ToResource(this Movie model, MovieTranslation movieT Id = model.Id, TmdbId = model.TmdbId, Title = translatedTitle, - OriginalTitle = model.Title, + OriginalTitle = model.OriginalTitle, SortTitle = translatedTitle.NormalizeTitle(), InCinemas = model.InCinemas, PhysicalRelease = model.PhysicalRelease, @@ -217,6 +217,7 @@ public static MovieResource ToResource(this Movie model, IUpgradableSpecificatio Id = model.Id, TmdbId = model.TmdbId, Title = translatedTitle, + OriginalTitle = model.OriginalTitle, SortTitle = translatedTitle.NormalizeTitle(), InCinemas = model.InCinemas, PhysicalRelease = model.PhysicalRelease, @@ -274,6 +275,7 @@ public static Movie ToModel(this MovieResource resource) TmdbId = resource.TmdbId, Title = resource.Title, + OriginalTitle = resource.OriginalTitle, SortTitle = resource.SortTitle, InCinemas = resource.InCinemas, PhysicalRelease = resource.PhysicalRelease,