diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-13 11:59:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-13 11:59:56 -0400 |
| commit | 7d0a4781830098811b9aecd8123b5f12cb85eaf9 (patch) | |
| tree | ed92af8646a698df9d9ed7908b8dfc9d7cb19870 | |
| parent | feb670672319c56c7270ab6a4a7f818f06fab61b (diff) | |
| parent | 2853fe3ea9788e74b26838cdd42493a63a8e4766 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Providers/BaseItemXmlParser.cs | 39 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/Ratings/de.txt | 10 |
2 files changed, 7 insertions, 42 deletions
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 1b5e303dd..6f246ef40 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -594,43 +594,8 @@ namespace MediaBrowser.Controller.Providers { switch (reader.Name) { - case "Value": - { - var ratingString = reader.ReadElementContentAsString(); - - int rating = 7; - - if (!string.IsNullOrWhiteSpace(ratingString)) - { - int.TryParse(ratingString, out rating); - } - - switch (rating) - { - case -1: - item.OfficialRating = "NR"; - break; - case 0: - item.OfficialRating = "UR"; - break; - case 1: - item.OfficialRating = "G"; - break; - case 3: - item.OfficialRating = "PG"; - break; - case 4: - item.OfficialRating = "PG-13"; - break; - case 5: - item.OfficialRating = "NC-17"; - break; - case 6: - item.OfficialRating = "R"; - break; - } - break; - } + // Removed support for "Value" tag as it conflicted with MPAA rating but leaving this function for possible + // future support of "Description" -ebr default: reader.Skip(); diff --git a/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt b/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt index 4683e1eb6..571b6eba9 100644 --- a/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt +++ b/MediaBrowser.Server.Implementations/Localization/Ratings/de.txt @@ -1,5 +1,5 @@ -DE-FSK,1 -DE-FSK,5 -DE-FSK,7 -DE-FSK,8 -DE-FSK,9
\ No newline at end of file +DE-FSK0,1 +DE-FSK6+,5 +DE-FSK12+,7 +DE-FSK16+,8 +DE-FSK18+,9 |