admin/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-23 03:27:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #18150 from jellyfin/release-12.z

Browse Source 
Read the image region when determining TMDb image language in `TmdbUtils`

Original-merge: 1d3ee4dd51

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
mateusbandeiraa authored and Cody Robibero committed 2026-09-27 16:30:53 -04:00
1 parent e31699cd3e
commit a62c35315c
3 files changed
+43 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Jellyfin.Providers.Tests/Tmdb/TmdbUtilsTests.cs
+18 -7
View File
@@ -30,14 +30,25 @@ namespace Jellyfin.Providers.Tests.Tmdb
}
[Theory]
[InlineData("en", "en-US", "en-US")]
[InlineData("fr-CA", "fr-BE", "fr-CA")]
[InlineData("fr-CA", "fr", "fr-CA")]
[InlineData("de", "en-US", "de")]
[InlineData("", "en-US", "")]
public static void AdjustImageLanguage_Valid_Success(string imageLanguage, string requestLanguage, string? expected)
// A regional request is only answered with a region when the image contradicts it.
[InlineData("pt", "BR", "pt-BR", "pt-BR")]
[InlineData("pt", "PT", "pt-BR", "pt-PT")]
[InlineData("en", "GB", "en-US", "en-GB")]
[InlineData("en", "US", "en-US", "en-US")]
[InlineData("en", null, "en-US", "en-US")]
// TMDb files nearly every image under a region, which must not stop a plain request matching.
[InlineData("en", "US", "en", "en")]
[InlineData("pt", "PT", "pt", "pt")]
// An image in another language keeps its bare code, so the English fallback still resolves.
[InlineData("en", "US", "pt-BR", "en")]
[InlineData("de", "DE", "en-US", "de")]
// TMDb returns xx rather than an empty string for an image with no text.
[InlineData("xx", "US", "en-US", "")]
[InlineData("", "US", "en-US", "")]
[InlineData(null, null, "en-US", "")]
public static void GetImageLanguage_Valid_Success(string? imageLanguage, string? imageRegion, string? requestLanguage, string expected)
{
Assert.Equal(expected, TmdbUtils.AdjustImageLanguage(imageLanguage, requestLanguage));
Assert.Equal(expected, TmdbUtils.GetImageLanguage(imageLanguage, imageRegion, requestLanguage));
}
[Theory]