diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-04 21:19:35 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-04 21:19:35 -0400 |
| commit | bcdd15d776cc953ec0b5296792feac20ab999819 (patch) | |
| tree | 38bba646f88416b244ccb4f8af0e07ce3c1c417a | |
| parent | b010faa85b59e24d7ae2e9056c8ebccc4ce2425b (diff) | |
| parent | dbccd8d1b645193b7c9345bb60b682728163c8cd (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index e3e144844..091ce7c63 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/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 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)) { |