diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-25 15:30:03 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-25 15:30:03 -0400 |
| commit | 16ef1101965dcd3f398af182a8acf0915e76d96a (patch) | |
| tree | 6c44d4d1e64804d1bc96432119c88519908f4a7f | |
| parent | bb721f610b4063c64111ca524920cd8062e64ec3 (diff) | |
| parent | 0edc717ec8f5cc8b451d99cdeb1aec8619a8c1a9 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 843b90b6c..3a5cd1b40 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/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} }; diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs index 817994c04..41f18b9a0 100644 --- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs +++ b/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; } } |