From bfc005642684402f82062868f2137f040fe3780a Mon Sep 17 00:00:00 2001 From: Christoph Landsdorf Date: Wed, 12 Jul 2023 20:32:43 +0200 Subject: [PATCH 1/2] Add TinyMediaManager compatibility for german parental rating This commit adds the format which gets written by the tool TinyMediaManager which can be used to manage large media databases comfortably. TMM writes wither multiple Codes and/or space divided german FSK codes, but can't be configured to only use the number or the slash delimited variant. After this change the parental control for Libraries managed with TMM and presented/loaded into Jellyfin should work again. --- Emby.Server.Implementations/Localization/Ratings/de.csv | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Emby.Server.Implementations/Localization/Ratings/de.csv b/Emby.Server.Implementations/Localization/Ratings/de.csv index d633a5dab7..f6181575e2 100644 --- a/Emby.Server.Implementations/Localization/Ratings/de.csv +++ b/Emby.Server.Implementations/Localization/Ratings/de.csv @@ -1,12 +1,17 @@ Educational,0 Infoprogramm,0 FSK-0,0 +FSK 0,0 0,0 FSK-6,6 +FSK 6,6 6,6 FSK-12,12 +FSK 12,12 12,12 FSK-16,16 +FSK 16,16 16,16 FSK-18,18 +FSK 18,18 18,18 From 48eb6f655b3b8a1743846c941c7031d14ff24a67 Mon Sep 17 00:00:00 2001 From: Christoph Landsdorf Date: Thu, 20 Jul 2023 10:10:02 +0000 Subject: [PATCH 2/2] Change: Update parental code count for DE in test --- .../Localization/LocalizationManagerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs index 7fabe99045..09e4709da3 100644 --- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs +++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs @@ -100,7 +100,7 @@ namespace Jellyfin.Server.Implementations.Tests.Localization await localizationManager.LoadAll(); var ratings = localizationManager.GetParentalRatings().ToList(); - Assert.Equal(19, ratings.Count); + Assert.Equal(24, ratings.Count); var fsk = ratings.FirstOrDefault(x => x.Name.Equals("FSK-12", StringComparison.Ordinal)); Assert.NotNull(fsk);