aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShadowghost <Shadowghost@users.noreply.github.com>2025-02-03 17:07:08 -0500
committerBond_009 <bond.009@outlook.com>2025-02-03 17:07:08 -0500
commitabdb5ab79ea51b6d6b07eb035c1350c9cb47a0eb (patch)
tree05b62198c1aaad71281b7aa4132b127a1b24f598
parenteb4162f9ec4ff13067256c74d310ea14f4fc9797 (diff)
Backport pull request #13388 from jellyfin/release-10.10.z
Fix rating levels Original-merge: 53a45c6033fe9e1f0bc33ad4e2426dd5032ae0b0 Merged-by: joshuaboniface <joshua@boniface.me> Backported-by: Bond_009 <bond.009@outlook.com>
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/br.csv8
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/ca.csv2
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/es.csv2
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/gb.csv3
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/ie.csv1
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/no.csv1
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/nz.csv1
-rw-r--r--Emby.Server.Implementations/Localization/Ratings/us.csv2
-rw-r--r--tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs2
9 files changed, 16 insertions, 6 deletions
diff --git a/Emby.Server.Implementations/Localization/Ratings/br.csv b/Emby.Server.Implementations/Localization/Ratings/br.csv
index 5ec1eb262..f6053c88c 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 336ee2806..41dbda134 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 619e948d8..ee5866090 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 75b1c2058..858b9a32d 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 6ef2e5012..d3c634fc9 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 c8f8e93db..6856a2dbb 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 f617f0c39..633da78fe 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 fc91edecd..9aa5c00eb 100644
--- a/Emby.Server.Implementations/Localization/Ratings/us.csv
+++ b/Emby.Server.Implementations/Localization/Ratings/us.csv
@@ -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/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
index 0afbf7e63..65f018ee3 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);