mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
16ef110196
2 changed files with 1 additions and 9 deletions
|
@ -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}
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue