lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke Pulverenti 2013-07-25 15:30:03 -04:00
commit 16ef110196
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/Folder.cs
View File

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

8
MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
View File

@ -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; return value == null ? (int?)null : value.Value;
} }
} }