The Free Software Media System - Server Backend & API
Respect library country code for parental ratings
theguymadmax119b2e3d2ff2
diff --git a/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs b/Emby.Server.Implementations/Sorting/OfficialRatingComparer.csindex 789af01cc3..c0e453d63d 100644--- a/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs+++ b/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs@@ -41,8 +41,8 @@ public class OfficialRatingComparer : IBaseItemComparerArgumentNullException.ThrowIfNull(y);var zeroRating = new ParentalRatingScore(0, 0);- var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating) ?? zeroRating;- var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating) ?? zeroRating;+ var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating, x.GetPreferredMetadataCountryCode()) ?? zeroRating;+ var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating, y.GetPreferredMetadataCountryCode()) ?? zeroRating;var scoreCompare = ratingX.Score.CompareTo(ratingY.Score);if (scoreCompare is 0){diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.csindex cb38b61119..2404ace751 100644--- a/MediaBrowser.Controller/Entities/BaseItem.cs+++ b/MediaBrowser.Controller/Entities/BaseItem.cs@@ -1604,7 +1604,7 @@ namespace MediaBrowser.Controller.Entitiesreturn !GetBlockUnratedValue(user);}- var ratingScore = LocalizationManager.GetRatingScore(rating);+ var ratingScore = LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());// Could not determine rating levelif (ratingScore is null)@@ -1646,7 +1646,7 @@ namespace MediaBrowser.Controller.Entitiesreturn 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);