소스 검색

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

Luke Pulverenti 12 년 전
부모
커밋
7d0a478183
2개의 변경된 파일7개의 추가작업 그리고 42개의 파일을 삭제
  1. 2 37
      MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
  2. 5 5
      MediaBrowser.Server.Implementations/Localization/Ratings/de.txt

+ 2 - 37
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();

+ 5 - 5
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
+DE-FSK0,1
+DE-FSK6+,5
+DE-FSK12+,7
+DE-FSK16+,8
+DE-FSK18+,9