Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-05 14:44:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #13639 from jellyfin/release-10.10.z

Browse Source 
Support more rating formats

Original-merge: 4f94d23011c4af755e6e05cc42f47befc7e43fcb

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
IDisposable 2025-03-02 11:23:02 -05:00 committed by Bond_009
parent aad7506e85
commit efb901c369
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/Localization/LocalizationManager.cs
View File

@ -286,8 +286,10 @@ namespace Emby.Server.Implementations.Localization
} }
// Fairly common for some users to have "Rated R" in their rating field // Fairly common for some users to have "Rated R" in their rating field
rating = rating.Replace("Rated :", string.Empty, StringComparison.OrdinalIgnoreCase); rating = rating.Replace("Rated :", string.Empty, StringComparison.OrdinalIgnoreCase)
rating = rating.Replace("Rated ", string.Empty, StringComparison.OrdinalIgnoreCase); .Replace("Rated:", string.Empty, StringComparison.OrdinalIgnoreCase)
.Replace("Rated ", string.Empty, StringComparison.OrdinalIgnoreCase)
.Trim();
// Use rating system matching the language // Use rating system matching the language
if (!string.IsNullOrEmpty(countryCode)) if (!string.IsNullOrEmpty(countryCode))

5
tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Emby.Server.Implementations.Localization; using Emby.Server.Implementations.Localization;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
@ -116,6 +115,10 @@ namespace Jellyfin.Server.Implementations.Tests.Localization
[InlineData("TV-MA", "US", 17)] [InlineData("TV-MA", "US", 17)]
[InlineData("XXX", "asdf", 1000)] [InlineData("XXX", "asdf", 1000)]
[InlineData("Germany: FSK-18", "DE", 18)] [InlineData("Germany: FSK-18", "DE", 18)]
[InlineData("Rated : R", "US", 17)]
[InlineData("Rated: R", "US", 17)]
[InlineData("Rated R", "US", 17)]
[InlineData(" PG-13 ", "US", 13)]
public async Task GetRatingLevel_GivenValidString_Success(string value, string countryCode, int expectedLevel) public async Task GetRatingLevel_GivenValidString_Success(string value, string countryCode, int expectedLevel)
{ {
var localizationManager = Setup(new ServerConfiguration() var localizationManager = Setup(new ServerConfiguration()