diff --git a/Emby.Server.Implementations/Localization/Ratings/br.csv b/Emby.Server.Implementations/Localization/Ratings/br.csv index 5ec1eb2627..f6053c88c7 100644 --- a/Emby.Server.Implementations/Localization/Ratings/br.csv +++ b/Emby.Server.Implementations/Localization/Ratings/br.csv @@ -1,8 +1,14 @@ Livre,0 L,0 -ER,9 +AL,0 +ER,10 10,10 +A10,10 12,12 +A12,12 14,14 +A14,14 16,16 +A16,16 18,18 +A18,18 diff --git a/Emby.Server.Implementations/Localization/Ratings/ca.csv b/Emby.Server.Implementations/Localization/Ratings/ca.csv index 336ee28067..41dbda1349 100644 --- a/Emby.Server.Implementations/Localization/Ratings/ca.csv +++ b/Emby.Server.Implementations/Localization/Ratings/ca.csv @@ -6,8 +6,6 @@ TV-Y7,7 TV-Y7-FV,7 PG,9 TV-PG,9 -PG-13,13 -13+,13 TV-14,14 14A,14 16+,16 diff --git a/Emby.Server.Implementations/Localization/Ratings/es.csv b/Emby.Server.Implementations/Localization/Ratings/es.csv index 619e948d88..ee58660900 100644 --- a/Emby.Server.Implementations/Localization/Ratings/es.csv +++ b/Emby.Server.Implementations/Localization/Ratings/es.csv @@ -1,7 +1,7 @@ A,0 A/fig,0 A/i,0 -A/fig/i,0 +A/i/fig,0 APTA,0 ERI,0 TP,0 diff --git a/Emby.Server.Implementations/Localization/Ratings/gb.csv b/Emby.Server.Implementations/Localization/Ratings/gb.csv index 75b1c20589..858b9a32dd 100644 --- a/Emby.Server.Implementations/Localization/Ratings/gb.csv +++ b/Emby.Server.Implementations/Localization/Ratings/gb.csv @@ -6,10 +6,11 @@ U,0 6+,6 7+,7 PG,8 -9+,9 +9,9 12,12 12+,12 12A,12 +12PG,12 Teen,13 13+,13 14+,14 diff --git a/Emby.Server.Implementations/Localization/Ratings/ie.csv b/Emby.Server.Implementations/Localization/Ratings/ie.csv index 6ef2e50128..d3c634fc93 100644 --- a/Emby.Server.Implementations/Localization/Ratings/ie.csv +++ b/Emby.Server.Implementations/Localization/Ratings/ie.csv @@ -4,6 +4,7 @@ PG,12 12A,12 12PG,12 15,15 +15PG,15 15A,15 16,16 18,18 diff --git a/Emby.Server.Implementations/Localization/Ratings/no.csv b/Emby.Server.Implementations/Localization/Ratings/no.csv index c8f8e93db7..6856a2dbbb 100644 --- a/Emby.Server.Implementations/Localization/Ratings/no.csv +++ b/Emby.Server.Implementations/Localization/Ratings/no.csv @@ -6,4 +6,5 @@ A,0 12,12 15,15 18,18 +C,18 Not approved,1001 diff --git a/Emby.Server.Implementations/Localization/Ratings/nz.csv b/Emby.Server.Implementations/Localization/Ratings/nz.csv index f617f0c39d..633da78fe1 100644 --- a/Emby.Server.Implementations/Localization/Ratings/nz.csv +++ b/Emby.Server.Implementations/Localization/Ratings/nz.csv @@ -10,6 +10,7 @@ R16,16 RP16,16 GA,18 R18,18 +RP18,18 MA,1000 R,1001 Objectionable,1001 diff --git a/Emby.Server.Implementations/Localization/Ratings/us.csv b/Emby.Server.Implementations/Localization/Ratings/us.csv index d103ddf42d..96016937b4 100644 --- a/Emby.Server.Implementations/Localization/Ratings/us.csv +++ b/Emby.Server.Implementations/Localization/Ratings/us.csv @@ -5,23 +5,23 @@ TV-Y,0 TV-Y7,7 TV-Y7-FV,7 PG,10 +TV-PG,10 +TV-PG-D,10 +TV-PG-L,10 +TV-PG-S,10 +TV-PG-V,10 +TV-PG-DL,10 +TV-PG-DS,10 +TV-PG-DV,10 +TV-PG-LS,10 +TV-PG-LV,10 +TV-PG-SV,1 +TV-PG-DLS,10 +TV-PG-DLV,10 +TV-PG-DSV,10 +TV-PG-LSV,10 +TV-PG-DLSV,10 PG-13,13 -TV-PG,13 -TV-PG-D,13 -TV-PG-L,13 -TV-PG-S,13 -TV-PG-V,13 -TV-PG-DL,13 -TV-PG-DS,13 -TV-PG-DV,13 -TV-PG-LS,13 -TV-PG-LV,13 -TV-PG-SV,13 -TV-PG-DLS,13 -TV-PG-DLV,13 -TV-PG-DSV,13 -TV-PG-LSV,13 -TV-PG-DLSV,13 TV-14,14 TV-14-D,14 TV-14-L,14 @@ -48,3 +48,5 @@ TV-MA-LS,17 TV-MA-LV,17 TV-MA-SV,17 TV-MA-LSV,17 +TV-X,18 +TV-AO,18 diff --git a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs index 247e1d8450..574ecbc3fa 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs @@ -30,7 +30,7 @@ namespace Jellyfin.Server.Migrations.Routines } /// - public Guid Id => Guid.Parse("{67445D54-B895-4B24-9F4C-35CE0690EA07}"); + public Guid Id => Guid.Parse("{D34BFC33-5D2E-4790-8085-069EF6EECB4E}"); /// public string Name => "MigrateRatingLevels"; diff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs index 0afbf7e634..65f018ee3f 100644 --- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs +++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs @@ -84,7 +84,7 @@ namespace Jellyfin.Server.Implementations.Tests.Localization await localizationManager.LoadAll(); var ratings = localizationManager.GetParentalRatings().ToList(); - Assert.Equal(54, ratings.Count); + Assert.Equal(56, ratings.Count); var tvma = ratings.FirstOrDefault(x => x.Name.Equals("TV-MA", StringComparison.Ordinal)); Assert.NotNull(tvma);