mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-15 14:46:19 +00:00
Merge pull request #16388 from theguymadmax/respect-library-country-code
Respect library country code for parental ratings
This commit is contained in:
@@ -1604,7 +1604,7 @@ namespace MediaBrowser.Controller.Entities
|
||||
return !GetBlockUnratedValue(user);
|
||||
}
|
||||
|
||||
var ratingScore = LocalizationManager.GetRatingScore(rating);
|
||||
var ratingScore = LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
|
||||
|
||||
// Could not determine rating level
|
||||
if (ratingScore is null)
|
||||
@@ -1646,7 +1646,7 @@ namespace MediaBrowser.Controller.Entities
|
||||
return null;
|
||||
}
|
||||
|
||||
return LocalizationManager.GetRatingScore(rating);
|
||||
return LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
|
||||
}
|
||||
|
||||
public List<string> GetInheritedTags()
|
||||
@@ -2609,7 +2609,7 @@ namespace MediaBrowser.Controller.Entities
|
||||
.Select(i => i.OfficialRating)
|
||||
.Where(i => !string.IsNullOrEmpty(i))
|
||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||
.Select(rating => (rating, LocalizationManager.GetRatingScore(rating)))
|
||||
.Select(rating => (rating, LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode())))
|
||||
.OrderBy(i => i.Item2 is null ? 1001 : i.Item2.Score)
|
||||
.ThenBy(i => i.Item2 is null ? 1001 : i.Item2.SubScore)
|
||||
.Select(i => i.rating);
|
||||
|
||||
Reference in New Issue
Block a user