Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

fix(setup): batch translated resource updates

Stamina90d6cdf65d27c
diff --git a/src/Filee.Setup/SetupTexts.cs b/src/Filee.Setup/SetupTexts.cs
index 5b117b78..5ca6946f 100644
--- a/src/Filee.Setup/SetupTexts.cs
+++ b/src/Filee.Setup/SetupTexts.cs
@@ -55,8 +55,14 @@ public sealed class SetupTexts
/// <summary>Publishes every text into <paramref name="resources"/> (English for missing translations).</summary>
public void Publish(IResourceDictionary resources)
{
- foreach (var key in _english.Keys.Concat(_current.Keys).Distinct())
- resources[key] = this[key];
+ var entries = _english.Keys.Concat(_current.Keys).Distinct()
+ .Select(key => new KeyValuePair<object, object?>(key, this[key]));
+ // ResourceDictionary batches notifications; retain support for other IResourceDictionary implementations.
+ if (resources is ResourceDictionary dictionary)
+ dictionary.SetItems(entries);
+ else
+ foreach (var (key, value) in entries)
+ resources[key] = value;
}
/// <summary>
diff --git a/tests/Filee.Setup.Tests/SetupTextsTests.cs b/tests/Filee.Setup.Tests/SetupTextsTests.cs
index 7abf0ff6..e8427add 100644
--- a/tests/Filee.Setup.Tests/SetupTextsTests.cs
+++ b/tests/Filee.Setup.Tests/SetupTextsTests.cs
@@ -3,6 +3,9 @@
extern alias app;
using System.Text.Json;
using System.Text.RegularExpressions;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Headless.XUnit;
using Filee.Engines.Infrastructure;
using Filee.Setup.Platform;
using LocalizationService = app::Filee.App.Services.LocalizationService;
@@ -106,6 +109,39 @@ public partial class SetupTextsTests
Assert.Equal("Install", texts["installer.install"]);
}
+ [AvaloniaFact]
+ public void Publishing_a_language_switch_raises_one_resource_change()
+ {
+ var app = Application.Current!;
+ Assert.IsType<ResourceDictionary>(app.Resources); // Setup publishes to this dictionary in ApplyLook.
+ var resources = new ResourceDictionary();
+ resources["unrelated"] = "kept";
+ var texts = new SetupTexts("en");
+ texts.Publish(resources);
+ app.Resources.MergedDictionaries.Add(resources);
+ var changes = 0;
+ void Count(object? sender, ResourcesChangedEventArgs e) => changes++;
+ app.ResourcesChanged += Count;
+ try
+ {
+ texts.SetLanguage("ko");
+ texts.Publish(resources);
+
+ Assert.Equal(1, changes);
+ Assert.True(resources.TryGetResource("installer.install", null, out var install));
+ Assert.Equal(texts["installer.install"], install);
+ Assert.NotEqual("Install", install);
+ Assert.True(resources.TryGetResource("general.language", null, out var language));
+ Assert.Equal(texts["general.language"], language);
+ Assert.Equal("kept", resources["unrelated"]);
+ }
+ finally
+ {
+ app.ResourcesChanged -= Count;
+ app.Resources.MergedDictionaries.Remove(resources);
+ }
+ }
+
[Fact]
public void Every_key_setup_uses_exists_in_english()
{