2 files changed, 151 insertions, 1 deletions
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
index aed584355c..e1346a8436 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
@@ -1,7 +1,13 @@
+using System.Collections.Generic;
 using Emby.Naming.Common;
+using Emby.Naming.Video;
 using Emby.Server.Implementations.Library.Resolvers.Movies;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
@@ -14,11 +20,12 @@ namespace Jellyfin.Server.Implementations.Tests.Library;
 public class MovieResolverTests
 {
     private static readonly NamingOptions _namingOptions = new();
+    private static readonly VideoListResolver _videoListResolver = new(_namingOptions);
 
     [Fact]
     public void Resolve_GivenLocalAlternateVersion_ResolvesToVideo()
     {
-        var movieResolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>());
+        var movieResolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
         var itemResolveArgs = new ItemResolveArgs(
             Mock.Of<IServerApplicationPaths>(),
             null)
@@ -32,4 +39,54 @@ public class MovieResolverTests
 
         Assert.NotNull(movieResolver.Resolve(itemResolveArgs));
     }
+
+    [Fact]
+    public void ResolveMultiple_GivenTvShowsCollection_CreatesEpisodeItems()
+    {
+        // For a tvshows collection, the multi-version grouping must still produce
+        // Episode BaseItems (not generic Video) so downstream metadata fetching
+        // and series-aware logic apply.
+        var movieResolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
+
+        var parent = new Folder { Path = "/TV/Show/Season 1" };
+        var files = new List<FileSystemMetadata>
+        {
+            new() { FullName = "/TV/Show/Season 1/Show - S01E01 - 1080p.mkv", Name = "Show - S01E01 - 1080p.mkv", IsDirectory = false },
+            new() { FullName = "/TV/Show/Season 1/Show - S01E01 - 720p.mkv", Name = "Show - S01E01 - 720p.mkv", IsDirectory = false },
+            new() { FullName = "/TV/Show/Season 1/Show - S01E02.mkv", Name = "Show - S01E02.mkv", IsDirectory = false }
+        };
+
+        var result = movieResolver.ResolveMultiple(parent, files, CollectionType.tvshows, Mock.Of<IDirectoryService>());
+
+        Assert.NotNull(result);
+        Assert.Equal(2, result.Items.Count);
+        Assert.All(result.Items, item => Assert.IsType<Episode>(item));
+
+        // The S01E01 item should have one alternate version
+        var s01e01 = result.Items.Find(i => i.Path.Contains("S01E01", System.StringComparison.Ordinal));
+        Assert.NotNull(s01e01);
+        Assert.Single(((Video)s01e01).LocalAlternateVersions);
+    }
+
+    [Fact]
+    public void ResolveMultiple_GivenMoviesCollection_CreatesMovieItems()
+    {
+        // For a movies collection, the multi-version grouping must produce Movie
+        // BaseItems (not generic Video) so downstream movie-specific logic applies.
+        var movieResolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
+
+        var parent = new Folder { Path = "/movies/Inception (2010)" };
+        var files = new List<FileSystemMetadata>
+        {
+            new() { FullName = "/movies/Inception (2010)/Inception (2010) - 1080p.mkv", Name = "Inception (2010) - 1080p.mkv", IsDirectory = false },
+            new() { FullName = "/movies/Inception (2010)/Inception (2010) - 720p.mkv", Name = "Inception (2010) - 720p.mkv", IsDirectory = false }
+        };
+
+        var result = movieResolver.ResolveMultiple(parent, files, CollectionType.movies, Mock.Of<IDirectoryService>());
+
+        Assert.NotNull(result);
+        Assert.Single(result.Items);
+        Assert.All(result.Items, item => Assert.IsType<Movie>(item));
+        Assert.Single(((Video)result.Items[0]).LocalAlternateVersions);
+    }
 }
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
index acabaf3acb..3b8fe5ca60 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BitFaster.Caching;
@@ -305,6 +306,98 @@ namespace Jellyfin.Server.Implementations.Tests.Localization
             Assert.Equal(key, translated);
         }
 
+        [Fact]
+        public void GetLocalizedString_WithCulture_ReturnsTranslation()
+        {
+            var localizationManager = Setup(new ServerConfiguration
+            {
+                UICulture = "en-US"
+            });
+
+            var translated = localizationManager.GetLocalizedString("Artists", "de");
+            Assert.Equal("Interpreten", translated);
+        }
+
+        [Fact]
+        public void GetLocalizedString_WithCulture_FallsBackToEnUs()
+        {
+            var localizationManager = Setup(new ServerConfiguration
+            {
+                UICulture = "en-US"
+            });
+
+            // A culture with no translation file should fall back to en-US
+            var translated = localizationManager.GetLocalizedString("Artists", "zz");
+            Assert.Equal("Artists", translated);
+        }
+
+        [Fact]
+        public void GetLocalizedString_WithBcp47Normalization_ReturnsTranslation()
+        {
+            var localizationManager = Setup(new ServerConfiguration
+            {
+                UICulture = "en-US"
+            });
+
+            // es-419 is stored as es_419 in Jellyfin
+            var translated = localizationManager.GetLocalizedString("Default", "es-419");
+            Assert.NotEqual("Default", translated);
+        }
+
+        [Fact]
+        public void GetServerLocalizedString_UsesServerCulture()
+        {
+            var localizationManager = Setup(new ServerConfiguration
+            {
+                UICulture = "de"
+            });
+
+            // Even if CurrentUICulture is fr, GetServerLocalizedString should use the server's "de"
+            var previousCulture = CultureInfo.CurrentUICulture;
+            try
+            {
+                CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("fr");
+                var translated = localizationManager.GetServerLocalizedString("Artists");
+                Assert.Equal("Interpreten", translated);
+            }
+            finally
+            {
+                CultureInfo.CurrentUICulture = previousCulture;
+            }
+        }
+
+        [Fact]
+        public void GetLocalizedString_UsesCurrentUICulture()
+        {
+            var localizationManager = Setup(new ServerConfiguration
+            {
+                UICulture = "en-US"
+            });
+
+            var previousCulture = CultureInfo.CurrentUICulture;
+            try
+            {
+                CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("de");
+                var translated = localizationManager.GetLocalizedString("Artists");
+                Assert.Equal("Interpreten", translated);
+            }
+            finally
+            {
+                CultureInfo.CurrentUICulture = previousCulture;
+            }
+        }
+
+        [Fact]
+        public void GetSupportedUICultures_IncludesCommonCultures()
+        {
+            var supported = LocalizationManager.GetSupportedUICultures();
+            Assert.Contains(supported, c => c.Name.Equals("de", StringComparison.OrdinalIgnoreCase));
+            Assert.Contains(supported, c => c.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase));
+            Assert.Contains(supported, c => c.Name.Equals("fr", StringComparison.OrdinalIgnoreCase));
+            // Underscore variants get normalized to BCP-47 hyphen form for CultureInfo compatibility.
+            Assert.Contains(supported, c => c.Name.Equals("es-419", StringComparison.OrdinalIgnoreCase));
+        }
+
         private LocalizationManager Setup(ServerConfiguration config)
         {
             var mockConfiguration = new Mock<IServerConfigurationManager>();