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

MediaBrowser.Controller/Entities/Folder.cs

@@ -206,7 +206,7 @@ namespace MediaBrowser.Controller.Entities
                 {LocalizedStrings.Instance.GetString("GenreDispPref"), GetIndexByGenre},
                 {LocalizedStrings.Instance.GetString("DirectorDispPref"), GetIndexByDirector},
                 {LocalizedStrings.Instance.GetString("YearDispPref"), GetIndexByYear},
-                {LocalizedStrings.Instance.GetString("OfficialRatingDispPref"), null},
+                //{LocalizedStrings.Instance.GetString("OfficialRatingDispPref"), null},
                 {LocalizedStrings.Instance.GetString("StudioDispPref"), GetIndexByStudio}
             };
 

MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs

@@ -237,14 +237,6 @@ namespace MediaBrowser.Server.Implementations.Localization
                 }
             }
 
-            // Try and support ratings that are incorrectly prefixed with localization values (GB-PG, which is really just PG)
-            var index = rating.IndexOf('-');
-
-            if (index != -1)
-            {
-                return GetRatingLevel(rating.Substring(index + 1));
-            }
-
             return value == null ? (int?)null : value.Value;
         }
     }