The Free Software Media System - Server Backend & API
Backport pull request #17933 from jellyfin/release-12.z
Shadowghost394facc327a2
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.csindex 65cb5379ea..c77717c76e 100644--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs@@ -139,6 +139,7 @@ namespace Emby.Server.Implementations.Localizationvar ratingSystem = await JsonSerializer.DeserializeAsync<ParentalRatingSystem>(stream, _jsonOptions).ConfigureAwait(false)?? throw new InvalidOperationException($"Invalid resource path: '{CountriesPath}'");+ // Rating strings are compared case insensitively, providers are not consistent about casing (e.g. "VM18" vs "vm18")var dict = new Dictionary<string, ParentalRatingScore?>(StringComparer.OrdinalIgnoreCase);if (ratingSystem.Ratings is not null){@@ -527,6 +528,12 @@ namespace Emby.Server.Implementations.Localizationreturn true;}+ // Explicitly unrated content (e.g. "IT-NR") is unrated by definition, not a lookup failure+ if (IsUnrated(ratingPart))+ {+ return true;+ }+_logger.LogWarning("Rating '{Rating}' not found in the '{CountryCode}' rating system, treating as unrated",rating,diff --git a/Emby.Server.Implementations/Localization/Ratings/it.json b/Emby.Server.Implementations/Localization/Ratings/it.jsonindex f2889bf82c..c1d716a46c 100644--- a/Emby.Server.Implementations/Localization/Ratings/it.json+++ b/Emby.Server.Implementations/Localization/Ratings/it.json@@ -3,28 +3,42 @@"supportsSubScores": false,"ratings": [{- "ratingStrings": ["T"],+ "ratingStrings": ["T", "PT", "Per tutti"],"ratingScore": {"score": 0,"subScore": null}},{- "ratingStrings": ["6+"],+ "ratingStrings": ["6+", "VM6", "VM 6", "VM-6", "Vietato ai minori di 6 anni"],"ratingScore": {"score": 6,"subScore": null}},{- "ratingStrings": ["14+"],+ "ratingStrings": ["10+", "VM10", "VM 10", "VM-10", "Vietato ai minori di 10 anni"],+ "ratingScore": {+ "score": 10,+ "subScore": null+ }+ },+ {+ "ratingStrings": ["12+", "VM12", "VM 12", "VM-12", "Vietato ai minori di 12 anni"],+ "ratingScore": {+ "score": 12,+ "subScore": null+ }+ },+ {+ "ratingStrings": ["14+", "VM14", "VM 14", "VM-14", "Vietato ai minori di 14 anni"],"ratingScore": {"score": 14,"subScore": null}},{- "ratingStrings": ["18+"],+ "ratingStrings": ["18+", "VM18", "VM 18", "VM-18", "Vietato ai minori di 18 anni"],"ratingScore": {"score": 18,"subScore": nulldiff --git a/Jellyfin.Server/Migrations/Routines/20260302090000_MigrateRatingLevels.cs b/Jellyfin.Server/Migrations/Routines/20260910120000_MigrateRatingLevels.cssimilarity index 97%rename from Jellyfin.Server/Migrations/Routines/20260302090000_MigrateRatingLevels.csrename to Jellyfin.Server/Migrations/Routines/20260910120000_MigrateRatingLevels.csindex ed92c34aa3..a456acf47d 100644--- a/Jellyfin.Server/Migrations/Routines/20260302090000_MigrateRatingLevels.cs+++ b/Jellyfin.Server/Migrations/Routines/20260910120000_MigrateRatingLevels.cs@@ -11,7 +11,7 @@ namespace Jellyfin.Server.Migrations.Routines;/// Migrate rating levels./// </summary>#pragma warning disable CS0618 // Type or member is obsolete-[JellyfinMigration("2026-03-02T09:00:00", nameof(MigrateRatingLevels))]+[JellyfinMigration("2026-09-10T12:00:00", nameof(MigrateRatingLevels))][JellyfinMigrationBackup(JellyfinDb = true)]#pragma warning restore CS0618 // Type or member is obsoleteinternal class MigrateRatingLevels : IDatabaseMigrationRoutinediff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.csindex ccec4e0037..221f1d8ec8 100644--- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs+++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs@@ -199,6 +199,16 @@ namespace Jellyfin.Server.Implementations.Tests.Localization[InlineData("Rated: R", "US", 17, 0)][InlineData("Rated R", "US", 17, 0)][InlineData(" PG-13 ", "US", 13, 0)]+ [InlineData("T", "IT", 0, null)]+ [InlineData("VM6", "IT", 6, null)]+ [InlineData("VM12", "IT", 12, null)]+ [InlineData("VM14", "IT", 14, null)]+ [InlineData("VM18", "IT", 18, null)]+ [InlineData("IT-VM14", "IT", 14, null)] // TMDB style country prefix+ [InlineData("IT-VM18", "IT", 18, null)]+ [InlineData("it-vm18", "IT", 18, null)] // Rating strings are case insensitive+ [InlineData("VM 18", "IT", 18, null)]+ [InlineData("Vietato ai minori di 18 anni", "IT", 18, null)]public async Task GetRatingLevel_GivenValidString_Success(string value, string countryCode, int? expectedScore, int? expectedSubScore){var localizationManager = Setup(new ServerConfiguration()