Pārlūkot izejas kodu

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Luke Pulverenti 12 gadi atpakaļ
vecāks
revīzija
bcdd15d776

+ 2 - 2
MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs

@@ -774,8 +774,8 @@ namespace MediaBrowser.Controller.Providers.Movies
                 {
                 {
                     var ourRelease = movieData.releases.countries.FirstOrDefault(c => c.iso_3166_1.Equals(ConfigurationManager.Configuration.MetadataCountryCode, StringComparison.OrdinalIgnoreCase)) ?? new Country();
                     var ourRelease = movieData.releases.countries.FirstOrDefault(c => c.iso_3166_1.Equals(ConfigurationManager.Configuration.MetadataCountryCode, StringComparison.OrdinalIgnoreCase)) ?? new Country();
                     var usRelease = movieData.releases.countries.FirstOrDefault(c => c.iso_3166_1.Equals("US", StringComparison.OrdinalIgnoreCase)) ?? new Country();
                     var usRelease = movieData.releases.countries.FirstOrDefault(c => c.iso_3166_1.Equals("US", StringComparison.OrdinalIgnoreCase)) ?? new Country();
-
-                    movie.OfficialRating = ourRelease.certification ?? usRelease.certification;
+                    var ratingPrefix = ConfigurationManager.Configuration.MetadataCountryCode.Equals("us", StringComparison.OrdinalIgnoreCase) ? "" : ConfigurationManager.Configuration.MetadataCountryCode +"-";
+                    movie.OfficialRating = ourRelease.certification != null ? ratingPrefix + ourRelease.certification : usRelease.certification;
 
 
                     if (ourRelease.release_date > new DateTime(1900, 1, 1))
                     if (ourRelease.release_date > new DateTime(1900, 1, 1))
                     {
                     {