Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat(i18n): enable runtime language switching without restart
fatDuck815f14c81ca8
diff --git a/optimizerDuck.Test/Common/Extensions/LocalizedObservableTests.cs b/optimizerDuck.Test/Common/Extensions/LocalizedObservableTests.csnew file mode 100644index 0000000..592d6d9--- /dev/null+++ b/optimizerDuck.Test/Common/Extensions/LocalizedObservableTests.cs@@ -0,0 +1,56 @@+using System.Globalization;+using optimizerDuck.Common.Extensions;+using optimizerDuck.Services.Configuration;++namespace optimizerDuck.Test.Common.Extensions;++public class LocalizedObservableTests : IDisposable+{+ private readonly CultureInfo _originalCulture;++ public LocalizedObservableTests()+ {+ _originalCulture = Loc.CurrentCulture;+ }++ public void Dispose()+ {+ Loc.Instance.ChangeCulture(_originalCulture);+ GC.SuppressFinalize(this);+ }++ private sealed class TestLocalized : LocalizedObject+ {+ public string Greeting => "Greeting";+ public string Farewell => "Farewell";+ public int NotAString => 42;+ }++ [Fact]+ public void WhenLanguageChanges_RaisesPropertyChangedForAllBindings()+ {+ var sut = new TestLocalized();+ var raised = new List<string?>();+ sut.PropertyChanged += (_, e) => raised.Add(e.PropertyName);++ Loc.Instance.ChangeCulture(new CultureInfo("vi"));++ // WPF convention: empty string means "all bindings" — the binding engine+ // re-evaluates every getter that wraps the localization indexer.+ Assert.Contains(string.Empty, raised);+ }++ [Fact]+ public void WhenLanguageChanges_DoesNotRaiseForNonStringProperties()+ {+ var sut = new TestLocalized();+ var raised = new List<string?>();+ sut.PropertyChanged += (_, e) => raised.Add(e.PropertyName);++ Loc.Instance.ChangeCulture(new CultureInfo("ja"));++ // Empty-string broadcast still counts; the goal is to verify no+ // individual non-string property name is targeted.+ Assert.DoesNotContain(nameof(TestLocalized.NotAString), raised);+ }+}diff --git a/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs b/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.csnew file mode 100644index 0000000..487fceb--- /dev/null+++ b/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs@@ -0,0 +1,162 @@+using System.ComponentModel;+using System.Globalization;+using optimizerDuck.Services.Configuration;++namespace optimizerDuck.Test.Services.Configuration;++public class LanguageManagerTests : IDisposable+{+ private readonly CultureInfo _originalCulture;++ public LanguageManagerTests()+ {+ _originalCulture = Loc.CurrentCulture;+ }++ public void Dispose()+ {+ // Reset culture after each test to avoid polluting other tests+ Loc.Instance.ChangeCulture(_originalCulture);+ }++ [Fact]+ public void ChangeCulture_SetsCurrentCulture()+ {+ var newCulture = new CultureInfo("vi");+ Loc.Instance.ChangeCulture(newCulture);++ Assert.Equal(newCulture, Loc.CurrentCulture);+ }++ [Fact]+ public void ChangeCulture_RaisesLanguageChangedEvent()+ {+ var newCulture = new CultureInfo("ja");+ CultureInfo? capturedCulture = null;+ EventHandler<LanguageChangedEventArgs> handler = (_, e) => capturedCulture = e.NewCulture;++ Loc.Instance.LanguageChanged += handler;+ try+ {+ Loc.Instance.ChangeCulture(newCulture);+ Assert.Equal(newCulture, capturedCulture);+ }+ finally+ {+ Loc.Instance.LanguageChanged -= handler;+ }+ }++ [Fact]+ public void ChangeCulture_RaisesItemIndexerPropertyChanged()+ {+ var newCulture = new CultureInfo("vi");+ var raisedProperties = new List<string?>();+ PropertyChangedEventHandler handler = (_, e) => raisedProperties.Add(e.PropertyName);++ Loc.Instance.PropertyChanged += handler;+ try+ {+ Loc.Instance.ChangeCulture(newCulture);+ }+ finally+ {+ Loc.Instance.PropertyChanged -= handler;+ }++ Assert.Contains("Item[]", raisedProperties);+ Assert.Contains(nameof(Loc.IsRtl), raisedProperties);+ Assert.Contains(nameof(Loc.Direction), raisedProperties);+ }++ [Fact]+ public void ChangeCulture_RaisesIsRtlAndDirection()+ {+ var raisedProperties = new List<string?>();+ PropertyChangedEventHandler handler = (_, e) => raisedProperties.Add(e.PropertyName);++ Loc.Instance.PropertyChanged += handler;+ try+ {+ Loc.Instance.ChangeCulture(new CultureInfo("vi"));+ }+ finally+ {+ Loc.Instance.PropertyChanged -= handler;+ }++ Assert.Contains(nameof(Loc.IsRtl), raisedProperties);+ Assert.Contains(nameof(Loc.Direction), raisedProperties);+ }++ [Fact]+ public void Indexer_ReturnsLocalizedStringForCurrentCulture()+ {+ Loc.Instance.ChangeCulture(new CultureInfo("en"));+ var english = Loc.Instance["Button.Ok"];++ Loc.Instance.ChangeCulture(new CultureInfo("vi"));+ var vietnamese = Loc.Instance["Button.Ok"];++ Assert.False(string.IsNullOrEmpty(english));+ Assert.False(string.IsNullOrEmpty(vietnamese));+ }++ [Fact]+ public void Indexer_ReturnsKeyWhenNotFound()+ {+ const string nonexistentKey = "NonExistent.Key.That.Does.Not.Exist";+ var result = Loc.Instance[nonexistentKey];+ Assert.Equal(nonexistentKey, result);+ }++ [Fact]+ public void Indexer_RefreshesAfterCultureChange()+ {+ Loc.Instance.ChangeCulture(new CultureInfo("en"));+ var beforeChange = Loc.Instance["Button.Ok"];++ Loc.Instance.ChangeCulture(new CultureInfo("vi"));+ var afterChange = Loc.Instance["Button.Ok"];++ // Strings should be present in both languages; assert non-empty+ Assert.False(string.IsNullOrEmpty(beforeChange));+ Assert.False(string.IsNullOrEmpty(afterChange));+ }++ [Fact]+ public void Invariant_ReturnsNeutralEnglishRegardlessOfCurrentCulture()+ {+ Loc.Instance.ChangeCulture(new CultureInfo("en"));+ var english = Loc.Invariant["Customize.Title"];++ Loc.Instance.ChangeCulture(new CultureInfo("vi-VN"));+ var vietnameseUi = Loc.Instance["Customize.Title"];+ var invariant = Loc.Invariant["Customize.Title"];++ // The UI-facing indexer follows the current culture...+ Assert.Equal("Tùy chỉnh", vietnameseUi);++ // ...while the invariant accessor keeps resolving the neutral English string.+ Assert.Equal("Customize", english);+ Assert.Equal(english, invariant);+ }++ [Fact]+ public void Invariant_FormatsArguments()+ {+ Loc.Instance.ChangeCulture(new CultureInfo("vi-VN"));++ Assert.Equal(+ "Delete registry key Foo",+ Loc.Invariant["Service.Registry.Description.DeleteKey", "Foo"]+ );+ }++ [Fact]+ public void Invariant_ReturnsKeyWhenNotFound()+ {+ const string nonexistentKey = "NonExistent.Invariant.Key";+ Assert.Equal(nonexistentKey, Loc.Invariant[nonexistentKey]);+ }+}diff --git a/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs b/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.csindex 3c70eaa..023ea17 100644--- a/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs+++ b/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs@@ -30,8 +30,8 @@ public class DiskCleanupServiceTestsvar item = new CleanupItem{Id = "TempFiles",- Name = "Temp Files",- Description = "Temp Description",+ NameKey = "Temp Files",+ DescriptionKey = "Temp Description",Path = tempRoot,Icon = SymbolRegular.Document24,};@@ -87,8 +87,8 @@ public class DiskCleanupServiceTestsvar item = new CleanupItem{Id = "TempFiles",- Name = "Temp Files",- Description = "Temp Description",+ NameKey = "Temp Files",+ DescriptionKey = "Temp Description",Path = tempRoot,Icon = SymbolRegular.Document24,};diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.csindex ed6ada8..3e617c9 100644--- a/optimizerDuck/App.xaml.cs+++ b/optimizerDuck/App.xaml.cs@@ -480,11 +480,11 @@ public partial class App : Applicationvar result = await _contentDialogService.ShowSimpleDialogAsync(new SimpleContentDialogCreateOptions{- Title = Translations.Dialog_PendingChanges_Title,- Content = Translations.Dialog_PendingChanges_Content,- CloseButtonText = Translations.Dialog_PendingChanges_CloseButton,- PrimaryButtonText = Translations.Dialog_PendingChanges_PrimaryButton,- SecondaryButtonText = Translations.Dialog_PendingChanges_SecondaryButton,+ Title = Loc.Instance["Dialog.PendingChanges.Title"],+ Content = Loc.Instance["Dialog.PendingChanges.Content"],+ CloseButtonText = Loc.Instance["Dialog.PendingChanges.CloseButton"],+ PrimaryButtonText = Loc.Instance["Dialog.PendingChanges.PrimaryButton"],+ SecondaryButtonText = Loc.Instance["Dialog.PendingChanges.SecondaryButton"],});diff --git a/optimizerDuck/Common/Extensions/LocalizationLogExtensions.cs b/optimizerDuck/Common/Extensions/LocalizationLogExtensions.csnew file mode 100644index 0000000..39cd42a--- /dev/null+++ b/optimizerDuck/Common/Extensions/LocalizationLogExtensions.cs@@ -0,0 +1,38 @@+using optimizerDuck.Domain.Abstractions;+using optimizerDuck.Domain.Customize.Models;+using optimizerDuck.Domain.Optimizations.Models;+using optimizerDuck.Services.Configuration;++namespace optimizerDuck.Common.Extensions;++/// <summary>+/// Culture-invariant logging helpers for <see cref="IOptimization" /> and+/// <see cref="ICustomizeSetting" />. Real models derive from <see cref="BaseOptimization" />+/// / <see cref="BaseCustomizeSetting" />, which provide the invariant properties; these+/// extensions forward to them for interface-typed call sites and fall back to the+/// localized names for any other implementation.+/// </summary>+public static class LocalizationLogExtensions+{+ /// <summary>Gets the culture-invariant (neutral English) name for logging.</summary>+ public static string LogName(this IOptimization optimization) =>+ optimization is BaseOptimization baseOptimization+ ? baseOptimization.LogName+ : optimization.Name;++ /// <summary>Gets the culture-invariant (neutral English) description for logging.</summary>+ public static string LogShortDescription(this IOptimization optimization) =>+ optimization is BaseOptimization baseOptimization+ ? baseOptimization.LogShortDescription+ : optimization.ShortDescription;++ /// <summary>Gets the culture-invariant (neutral English) name for logging.</summary>+ public static string LogName(this ICustomizeSetting setting) =>+ setting is BaseCustomizeSetting baseSetting ? baseSetting.LogName : setting.Name;++ /// <summary>Gets the culture-invariant (neutral English) description for logging.</summary>+ public static string LogDescription(this ICustomizeSetting setting) =>+ setting is BaseCustomizeSetting baseSetting+ ? baseSetting.LogDescription+ : setting.Description;+}diff --git a/optimizerDuck/Common/Extensions/LocalizedObject.cs b/optimizerDuck/Common/Extensions/LocalizedObject.csnew file mode 100644index 0000000..9057854--- /dev/null+++ b/optimizerDuck/Common/Extensions/LocalizedObject.cs@@ -0,0 +1,59 @@+using System.Globalization;+using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Services.Configuration;++namespace optimizerDuck.Common.Extensions;++/// <summary>+/// Base class for ViewModels and domain models that expose localized strings.+/// Auto-subscribes to <see cref="Loc.LanguageChanged" /> and:+/// <list type="number">+/// <item>+/// Raises <see cref="ObservableObject.OnPropertyChanged(string)" /> with the WPF+/// sentinel <c>string.Empty</c> so every binding whose source is this object+/// re-evaluates its getter (for properties expressed as+/// <c>=> Loc.Instance["key"]</c>).+/// </item>+/// <item>+/// Invokes the virtual <see cref="OnLanguageChanged" /> hook so subclasses can+/// refresh cached backing fields and rebuild collections of localized strings+/// that the empty-string PropertyChanged broadcast cannot reach on its own.+/// </item>+/// </list>+/// </summary>+/// <remarks>+/// Conventions:+/// <list type="bullet">+/// <item>+/// Localized expression-bodied properties: <c>public string Name => Loc.Instance["X.Y.Name"];</c>.+/// The binding re-evaluates the getter on culture change automatically.+/// </item>+/// <item>+/// For values cached into a backing field, override+/// <see cref="OnLanguageChanged" /> and re-assign the field so the generated+/// setter raises PropertyChanged for that property name.+/// </item>+/// <item>+/// For collections of localized strings (e.g. grouped sections), override+/// <see cref="OnLanguageChanged" /> and reassign the collection so WPF rebinds+/// the ItemsSource, or raise <c>OnPropertyChanged("Sections")</c>.+/// </item>+/// </list>+/// </remarks>+public abstract class LocalizedObject : ObservableObject+{+ protected LocalizedObject()+ {+ // Loc lives for whole app. Use weak event so ViewModels can be freed (GC) when closed.+ Loc.AddWeakLanguageChangedHandler(OnLanguageChangedCore);+ }++ private void OnLanguageChangedCore(object? sender, LanguageChangedEventArgs e)+ {+ OnPropertyChanged(string.Empty);+ OnLanguageChanged(e.NewCulture);+ }++ /// <summary>Called after language changes. Override to update cached values.</summary>+ protected virtual void OnLanguageChanged(CultureInfo newCulture) { }+}diff --git a/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs b/optimizerDuck/Common/Helpers/GitHubSourceHelper.csindex 4a72e14..84ac4a4 100644--- a/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs+++ b/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs@@ -6,6 +6,7 @@ using System.Net.Http.Headers;using System.Text.RegularExpressions;using Microsoft.Extensions.Logging;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using Wpf.Ui;using Wpf.Ui.Controls;@@ -78,8 +79,8 @@ public static class GitHubSourceHelper{logger?.LogError(ex, "Failed to open GitHub URL: {Url}", url);snackbarService?.Show(- Translations.Snackbar_OpenLinkFailed_Title,- Translations.Snackbar_OpenLinkFailed_Message,+ Loc.Instance["Snackbar.OpenLinkFailed.Title"],+ Loc.Instance["Snackbar.OpenLinkFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/CpuBrandCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/CpuBrandCondition.csindex e480f4f..0de54b5 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/CpuBrandCondition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/CpuBrandCondition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -33,15 +34,16 @@ public abstract class CpuBrandCondition : ConditionBasepublic sealed class IntelCpuCondition : CpuBrandCondition{protected override CpuVendor RequiredVendor => CpuVendor.Intel;- protected override Func<string> Title => () => Translations.Condition_Cpu_Intel_Title;+ protected override Func<string> Title => () => Loc.Instance["Condition.Cpu.Intel.Title"];protected override Func<string> Description =>- () => Translations.Condition_Cpu_Intel_Description;+ () => Loc.Instance["Condition.Cpu.Intel.Description"];}/// <summary>Requires an AMD CPU.</summary>public sealed class AmdCpuCondition : CpuBrandCondition{protected override CpuVendor RequiredVendor => CpuVendor.AMD;- protected override Func<string> Title => () => Translations.Condition_Cpu_Amd_Title;- protected override Func<string> Description => () => Translations.Condition_Cpu_Amd_Description;+ protected override Func<string> Title => () => Loc.Instance["Condition.Cpu.Amd.Title"];+ protected override Func<string> Description =>+ () => Loc.Instance["Condition.Cpu.Amd.Description"];}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/GpuBrandCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/GpuBrandCondition.csindex fedf822..70aedb1 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/GpuBrandCondition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/GpuBrandCondition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -37,24 +38,25 @@ public abstract class GpuBrandCondition : ConditionBasepublic sealed class NvidiaGpuCondition : GpuBrandCondition{protected override GpuVendor RequiredVendor => GpuVendor.NVIDIA;- protected override Func<string> Title => () => Translations.Condition_Gpu_Nvidia_Title;+ protected override Func<string> Title => () => Loc.Instance["Condition.Gpu.Nvidia.Title"];protected override Func<string> Description =>- () => Translations.Condition_Gpu_Nvidia_Description;+ () => Loc.Instance["Condition.Gpu.Nvidia.Description"];}/// <summary>Requires an AMD GPU.</summary>public sealed class AmdGpuCondition : GpuBrandCondition{protected override GpuVendor RequiredVendor => GpuVendor.AMD;- protected override Func<string> Title => () => Translations.Condition_Gpu_Amd_Title;- protected override Func<string> Description => () => Translations.Condition_Gpu_Amd_Description;+ protected override Func<string> Title => () => Loc.Instance["Condition.Gpu.Amd.Title"];+ protected override Func<string> Description =>+ () => Loc.Instance["Condition.Gpu.Amd.Description"];}/// <summary>Requires an Intel GPU.</summary>public sealed class IntelGpuCondition : GpuBrandCondition{protected override GpuVendor RequiredVendor => GpuVendor.Intel;- protected override Func<string> Title => () => Translations.Condition_Gpu_Intel_Title;+ protected override Func<string> Title => () => Loc.Instance["Condition.Gpu.Intel.Title"];protected override Func<string> Description =>- () => Translations.Condition_Gpu_Intel_Description;+ () => Loc.Instance["Condition.Gpu.Intel.Description"];}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/MinimumRamCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/MinimumRamCondition.csindex acb0ea4..483698a 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/MinimumRamCondition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/MinimumRamCondition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -25,6 +26,7 @@ public abstract class MinimumRamCondition : ConditionBasepublic sealed class SixteenGbRamCondition : MinimumRamCondition{protected override double MinimumGb => 16;- protected override Func<string> Title => () => Translations.Condition_Ram_16_Title;- protected override Func<string> Description => () => Translations.Condition_Ram_16_Description;+ protected override Func<string> Title => () => Loc.Instance["Condition.Ram.16.Title"];+ protected override Func<string> Description =>+ () => Loc.Instance["Condition.Ram.16.Description"];}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/RecallInstalledCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/RecallInstalledCondition.csindex e498087..c0022c5 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/RecallInstalledCondition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/RecallInstalledCondition.cs@@ -1,5 +1,6 @@using System.IO;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -26,8 +27,8 @@ public sealed class RecallInstalledCondition : ConditionBasereturn isSupported? ConditionResult.Available: ConditionResult.Unsupported(- () => Translations.Condition_Recall_Title,- () => Translations.Condition_Recall_Description+ () => Loc.Instance["Condition.Recall.Title"],+ () => Loc.Instance["Condition.Recall.Description"]);}}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/Windows10Condition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/Windows10Condition.csindex 4029bfd..988a646 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/Windows10Condition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/Windows10Condition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -11,7 +12,7 @@ public sealed class Windows10Condition : ConditionBase&& build is >= WindowsBuilds.Windows10 and < WindowsBuilds.Windows11? ConditionResult.Available: ConditionResult.Unsupported(- () => Translations.Condition_Windows10_Title,- () => Translations.Condition_Windows10_Description+ () => Loc.Instance["Condition.Windows10.Title"],+ () => Loc.Instance["Condition.Windows10.Description"]);}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/Windows11Condition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/Windows11Condition.csindex bbc098c..f28f01e 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/Windows11Condition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/Windows11Condition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -10,7 +11,7 @@ public sealed class Windows11Condition : ConditionBaseTryGetOsBuild(snapshot, out var build) && build >= WindowsBuilds.Windows11? ConditionResult.Available: ConditionResult.Unsupported(- () => Translations.Condition_Windows11_Title,- () => Translations.Condition_Windows11_Description+ () => Loc.Instance["Condition.Windows11.Title"],+ () => Loc.Instance["Condition.Windows11.Description"]);}diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/Windows11_24H2OrGreaterCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/Windows11_24H2OrGreaterCondition.csindex 0a4d22e..ccf5ab0 100644--- a/optimizerDuck/Domain/Conditions/BuiltIn/Windows11_24H2OrGreaterCondition.cs+++ b/optimizerDuck/Domain/Conditions/BuiltIn/Windows11_24H2OrGreaterCondition.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;namespace optimizerDuck.Domain.Conditions;@@ -13,7 +14,7 @@ public sealed class Windows11_24H2OrGreaterCondition : ConditionBaseTryGetOsBuild(snapshot, out var build) && build >= WindowsBuilds.Windows11_24H2? ConditionResult.Available: ConditionResult.Unsupported(- () => Translations.Condition_Windows11_24H2_Title,- () => Translations.Condition_Windows11_24H2_Description+ () => Loc.Instance["Condition.Windows11_24H2.Title"],+ () => Loc.Instance["Condition.Windows11_24H2.Description"]);}diff --git a/optimizerDuck/Domain/Conditions/ConditionResult.cs b/optimizerDuck/Domain/Conditions/ConditionResult.csindex 91f6d2f..592a454 100644--- a/optimizerDuck/Domain/Conditions/ConditionResult.cs+++ b/optimizerDuck/Domain/Conditions/ConditionResult.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Domain.Conditions;@@ -44,8 +45,8 @@ public sealed class ConditionResultpublic static ConditionResult Error() =>new(ConditionState.Error,- () => Translations.Condition_Error_Title,- () => Translations.Condition_Error_Description+ () => Loc.Instance["Condition.Error.Title"],+ () => Loc.Instance["Condition.Error.Description"]);/// <summary>Gets the outcome state of the check.</summary>diff --git a/optimizerDuck/Domain/Customize/Categories/Desktop.cs b/optimizerDuck/Domain/Customize/Categories/Desktop.csindex f4340a5..aa0eb49 100644--- a/optimizerDuck/Domain/Customize/Categories/Desktop.cs+++ b/optimizerDuck/Domain/Customize/Categories/Desktop.cs@@ -1,4 +1,5 @@using System.Collections.ObjectModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;@@ -13,7 +14,7 @@ using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Customize.Categories;[CustomizeCategory(PageType = typeof(DesktopFeatureCategory))]-public class Desktop : ICustomizeCategory+public class Desktop : LocalizedObject, ICustomizeCategory{private enum Sections{diff --git a/optimizerDuck/Domain/Customize/Categories/Gaming.cs b/optimizerDuck/Domain/Customize/Categories/Gaming.csindex 987b2df..9ea7a57 100644--- a/optimizerDuck/Domain/Customize/Categories/Gaming.cs+++ b/optimizerDuck/Domain/Customize/Categories/Gaming.cs@@ -1,4 +1,5 @@using System.Collections.ObjectModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -13,7 +14,7 @@ using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Customize.Categories;[CustomizeCategory(PageType = typeof(GamingFeatureCategory))]-public class Gaming : ICustomizeCategory+public class Gaming : LocalizedObject, ICustomizeCategory{private enum Sections{diff --git a/optimizerDuck/Domain/Customize/Categories/Preferences.cs b/optimizerDuck/Domain/Customize/Categories/Preferences.csindex 021351d..8e84335 100644--- a/optimizerDuck/Domain/Customize/Categories/Preferences.cs+++ b/optimizerDuck/Domain/Customize/Categories/Preferences.cs@@ -1,4 +1,5 @@using System.Collections.ObjectModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;@@ -14,7 +15,7 @@ using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Customize.Categories;[CustomizeCategory(PageType = typeof(PreferencesFeatureCategory))]-public class Preferences : ICustomizeCategory+public class Preferences : LocalizedObject, ICustomizeCategory{private enum Sections{diff --git a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.csindex 63ca1bc..313e0e2 100644--- a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs+++ b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs@@ -1,4 +1,5 @@using System.Collections.ObjectModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -11,7 +12,7 @@ using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Customize.Categories;[CustomizeCategory(PageType = typeof(SystemFeatureCategory))]-public class SystemFeatures : ICustomizeCategory+public class SystemFeatures : LocalizedObject, ICustomizeCategory{private enum Sections{diff --git a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.csindex a0c6588..4a6bbd6 100644--- a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs+++ b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs@@ -1,5 +1,6 @@using System.Reflection;using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;@@ -17,7 +18,7 @@ namespace optimizerDuck.Domain.Customize.Models;/// Windows surfaces should be refreshed after applying./// For Dropdown settings, options can carry <see cref="RegistryBinding"/> to auto-read/write./// </summary>-public abstract partial class BaseCustomizeSetting : ObservableObject, ICustomizeSetting+public abstract partial class BaseCustomizeSetting : LocalizedObject, ICustomizeSetting{private CustomizeSettingAttribute? _meta;@@ -40,6 +41,12 @@ public abstract partial class BaseCustomizeSetting : ObservableObject, ICustomizpublic string Name => Loc.Instance[$"Customize.{OwnerKey}.{FeatureKey}.Name"];public string Description => Loc.Instance[$"Customize.{OwnerKey}.{FeatureKey}.Description"];+ /// <summary>English name for log (always English, not translated).</summary>+ public string LogName => Loc.Invariant[$"Customize.{OwnerKey}.{FeatureKey}.Name"];++ /// <summary>English description for log (always English).</summary>+ public string LogDescription => Loc.Invariant[$"Customize.{OwnerKey}.{FeatureKey}.Description"];+/// <summary>/// Gets the compatibility condition type declared in the/// <see cref="CustomizeSettingAttribute"/> (implementing <see cref="ICondition"/>),diff --git a/optimizerDuck/Domain/Execution/ExecutionScope.cs b/optimizerDuck/Domain/Execution/ExecutionScope.csindex cae959d..9c01f64 100644--- a/optimizerDuck/Domain/Execution/ExecutionScope.cs+++ b/optimizerDuck/Domain/Execution/ExecutionScope.cs@@ -5,6 +5,7 @@ using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Optimizations.Models;using optimizerDuck.Domain.UI;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Domain.Execution;@@ -341,21 +342,11 @@ public sealed class ExecutionScope : IDisposableStatus = status,Message = status switch{- OptimizationSuccessResult.Success => string.Format(- Translations.Optimization_Apply_Success,- OptimizationName- ),- OptimizationSuccessResult.Failed when allFailed => string.Format(- Translations.Optimization_Apply_Error_Failed,- OptimizationName- ),+ OptimizationSuccessResult.Success => Loc.Instance["Optimization.Apply.Success", OptimizationName],+ OptimizationSuccessResult.Failed when allFailed => Loc.Instance["Optimization.Apply.Error.Failed", OptimizationName],OptimizationSuccessResult.PartialSuccess or OptimizationSuccessResult.Failed =>- string.Format(- Translations.Optimization_Apply_Error_FailedWithSteps,- OptimizationName,- failedSteps.Count- ),- _ => string.Format(Translations.Optimization_Apply_Error_Unknown, OptimizationName),+ Loc.Instance["Optimization.Apply.Error.FailedWithSteps", OptimizationName, failedSteps.Count],+ _ => Loc.Instance["Optimization.Apply.Error.Unknown", OptimizationName],},FailedSteps = failedSteps,};diff --git a/optimizerDuck/Domain/Optimizations/Categories/AI.cs b/optimizerDuck/Domain/Optimizations/Categories/AI.csindex 2e534ca..a00f5c0 100644--- a/optimizerDuck/Domain/Optimizations/Categories/AI.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/AI.cs@@ -1,5 +1,6 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -13,7 +14,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(AIOptimizerPage))]-public class AI : IOptimizationCategory+public class AI : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(AI)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.AI;diff --git a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.csindex 6ff49b7..a64ddd2 100644--- a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs@@ -1,5 +1,6 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Optimizations.Models;@@ -12,7 +13,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(BloatwareAndServicesOptimizerPage))]-public class BloatwareAndServices : IOptimizationCategory+public class BloatwareAndServices : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(BloatwareAndServices)}"];public OptimizationCategoryOrder Order { get; init; } =@@ -319,11 +320,7 @@ public class BloatwareAndServices : IOptimizationCategoryprogress?.Report(new ProcessingProgress{- Message = string.Format(- Loc.Instance[$"{ProgressPrefix}.ChangeServiceStartupType"],- service.Name,- service.StartupType- ),+ Message = Loc.Instance[$"{ProgressPrefix}.ChangeServiceStartupType", service.Name, service.StartupType],Value = i + 1,Total = servicesToChange.Count,}diff --git a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs b/optimizerDuck/Domain/Optimizations/Categories/Gpu.csindex 2c6bedc..f975c1b 100644--- a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs@@ -1,5 +1,6 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -56,7 +57,7 @@ public abstract class GpuRegistryOptimization : BaseOptimization}[OptimizationCategory(typeof(GpuOptimizerPage))]-public class Gpu : IOptimizationCategory+public class Gpu : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(Gpu)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Gpu;diff --git a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs b/optimizerDuck/Domain/Optimizations/Categories/Performance.csindex b2c0b85..288d10d 100644--- a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs@@ -1,6 +1,7 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;using Microsoft.Win32;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Optimizations.Models;@@ -13,7 +14,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(PerformanceOptimizerPage))]-public class Performance : IOptimizationCategory+public class Performance : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(Performance)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Performance;@@ -68,10 +69,7 @@ public class Performance : IOptimizationCategory);return Task.FromResult(ApplyResult.False(- string.Format(- Loc.Instance[$"{ErrorPrefix}.InvalidRAM"],- context.Snapshot.Ram.TotalKB- )+ Loc.Instance[$"{ErrorPrefix}.InvalidRAM", context.Snapshot.Ram.TotalKB]));}diff --git a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.csindex 091b52b..88253ae 100644--- a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs@@ -4,6 +4,7 @@ using System.Text.RegularExpressions;using Microsoft.Extensions.Logging;using Newtonsoft.Json;using Newtonsoft.Json.Linq;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;@@ -20,7 +21,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(PowerManagementOptimizerPage))]-public class PowerManagement : IOptimizationCategory+public class PowerManagement : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(PowerManagement)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Power;@@ -111,8 +112,8 @@ public class PowerManagement : IOptimizationCategoryvar revertStep = new UsbPowerRevertStep { States = capturedStates };ExecutionScope.RecordStep(- Translations.Service_Shell_Name,- Name,+ Loc.Invariant["Service.Shell.Name"],+ Loc.Invariant[$"Optimizer.{nameof(PowerManagement)}"],disableResult.ExitCode == 0,disableResult.ExitCode == 0 ? revertStep : null,disableResult.ExitCode == 0 ? null : disableResult.Stderrdiff --git a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.csindex b3d8900..63bda3e 100644--- a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs@@ -1,5 +1,6 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -13,7 +14,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(SecurityAndPrivacyOptimizerPage))]-public class SecurityAndPrivacy : IOptimizationCategory+public class SecurityAndPrivacy : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(SecurityAndPrivacy)}"];public OptimizationCategoryOrder Order { get; init; } =diff --git a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.csindex e1c12c1..7f2d676 100644--- a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs@@ -1,6 +1,7 @@using System.Collections.ObjectModel;using Microsoft.Extensions.Logging;using Microsoft.Win32;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -14,7 +15,7 @@ using optimizerDuck.UI.Pages.Optimize.Categories;namespace optimizerDuck.Domain.Optimizations.Categories;[OptimizationCategory(typeof(UserExperienceOptimizerPage))]-public class UserExperience : IOptimizationCategory+public class UserExperience : LocalizedObject, IOptimizationCategory{public string Name => Loc.Instance[$"Optimizer.{nameof(UserExperience)}"];public OptimizationCategoryOrder Order { get; init; } =diff --git a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.csindex c92dc93..8114978 100644--- a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs+++ b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs@@ -1,6 +1,7 @@using System.ComponentModel;using System.Reflection;using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Domain.Conditions;@@ -18,7 +19,7 @@ namespace optimizerDuck.Domain.Optimizations.Models;/// decorated with <see cref="OptimizationAttribute"/> to provide metadata. The category/// (<see cref="OwnerType"/>) is assigned automatically during reflection-based discovery./// </summary>-public abstract partial class BaseOptimization : ObservableObject, IOptimization+public abstract partial class BaseOptimization : LocalizedObject, IOptimization{protected BaseOptimization(){@@ -71,22 +72,22 @@ public abstract partial class BaseOptimization : ObservableObject, IOptimization{OptimizationRisk.Safe => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Safe,+ Display = Loc.Instance["Optimizer.UI.Risk.Safe"],Icon = SymbolRegular.ShieldCheckmark24,},OptimizationRisk.Moderate => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Moderate,+ Display = Loc.Instance["Optimizer.UI.Risk.Moderate"],Icon = SymbolRegular.Warning24,},OptimizationRisk.Risky => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Risky,+ Display = Loc.Instance["Optimizer.UI.Risk.Risky"],Icon = SymbolRegular.ShieldError24,},_ => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Safe,+ Display = Loc.Instance["Optimizer.UI.Risk.Safe"],Icon = SymbolRegular.ShieldCheckmark24,},};@@ -129,7 +130,6 @@ public abstract partial class BaseOptimization : ObservableObject, IOptimization#endregion#region Localization-/// <summary>Gets the full localization prefix for this optimization.</summary>public string Prefix => Loc.Instance[$"Optimizer.{OwnerKey}.{OptimizationKey}"];@@ -145,6 +145,13 @@ public abstract partial class BaseOptimization : ObservableObject, IOptimization/// <summary>Gets the localized short description of what this optimization does.</summary>public string ShortDescription => Loc.Instance[$"{Prefix}.ShortDescription"];+ /// <summary>English name for log (always English).</summary>+ public string LogName => Loc.Invariant[$"Optimizer.{OwnerKey}.{OptimizationKey}.Name"];++ /// <summary>English short description for log (always English).</summary>+ public string LogShortDescription =>+ Loc.Invariant[$"Optimizer.{OwnerKey}.{OptimizationKey}.ShortDescription"];+#endregion#region Condition@@ -190,6 +197,6 @@ public abstract partial class BaseOptimization : ObservableObject, IOptimizationprotected static ApplyResult CompleteFromScope(){return ExecutionScope.Current?.ToApplyResult()- ?? ApplyResult.False(Translations.Revert_Error_NoSteps);+ ?? ApplyResult.False(Loc.Instance["Revert.Error.NoSteps"]);}}diff --git a/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs b/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.csindex 6924727..26439b2 100644--- a/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs+++ b/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs@@ -1,6 +1,7 @@using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.UI;-using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Optimizations.Models.Bloatware;@@ -18,7 +19,11 @@ public enum AppRisk/// <summary>/// Represents an AppX package (UWP app) that can be removed./// </summary>-public partial class AppXPackage : ObservableObject+/// <remarks>+/// Derives from <see cref="LocalizedObject" /> so the computed <see cref="RiskVisual" />+/// binding re-resolves when the UI language changes at runtime.+/// </remarks>+public partial class AppXPackage : LocalizedObject{/// <summary>/// Indicates whether this package is selected for removal.@@ -69,17 +74,17 @@ public partial class AppXPackage : ObservableObject{AppRisk.Safe => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Safe,+ Display = Loc.Instance["Optimizer.UI.Risk.Safe"],Icon = SymbolRegular.ShieldCheckmark24,},AppRisk.Caution => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Moderate,+ Display = Loc.Instance["Optimizer.UI.Risk.Moderate"],Icon = SymbolRegular.Warning24,},_ => new RiskVisual{- Display = Translations.Optimizer_UI_Risk_Safe,+ Display = Loc.Instance["Optimizer.UI.Risk.Safe"],Icon = SymbolRegular.ShieldCheckmark24,},};diff --git a/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.csindex a7398b7..bb1f78f 100644--- a/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs+++ b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs@@ -1,12 +1,13 @@using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;+using optimizerDuck.Services.Configuration;using Wpf.Ui.Controls;namespace optimizerDuck.Domain.Optimizations.Models.Cleanup;/// <summary>/// Represents a disk cleanup item (e.g., temp files, Windows Update cache).-/// </summary>-public partial class CleanupItem : ObservableObject+public partial class CleanupItem : LocalizedObject{/// <summary>/// The number of files in this cleanup item.@@ -53,14 +54,29 @@ public partial class CleanupItem : ObservableObjectpublic required string Id { get; init; }/// <summary>- /// Display name of the cleanup item.+ /// Display name of the cleanup item. Returns the localized string for the+ /// current culture by looking up the resource key set at construction time./// </summary>- public required string Name { get; init; }+ public string Name => Loc.Instance[NameKey];/// <summary>- /// Description of what this cleanup item contains.+ /// Description of what this cleanup item contains. Returns the localized string+ /// for the current culture by looking up the resource key set at construction time./// </summary>- public required string Description { get; init; }+ public string Description => Loc.Instance[DescriptionKey];++ /// <summary>+ /// Resource key used to localize <see cref="Name" />. Set at construction time so+ /// that the localized value can be re-resolved whenever the UI language changes.+ /// </summary>+ public string NameKey { get; init; } = string.Empty;++ /// <summary>+ /// Resource key used to localize <see cref="Description" />. Set at construction+ /// time so that the localized value can be re-resolved whenever the UI language+ /// changes.+ /// </summary>+ public string DescriptionKey { get; init; } = string.Empty;/// <summary>/// The file path or folder to clean.diff --git a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.csindex baf485e..47f91ef 100644--- a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs+++ b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs@@ -1,13 +1,15 @@using System.Collections.ObjectModel;using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Domain.Optimizations.Models.ScheduledTask;/// <summary>/// Represents a Windows Scheduled Task./// </summary>-public partial class ScheduledTaskModel : ObservableObject+public partial class ScheduledTaskModel : LocalizedObject{/// <summary>/// Indicates whether the task is enabled.@@ -27,6 +29,21 @@ public partial class ScheduledTaskModel : ObservableObject[ObservableProperty]private string _state = string.Empty;+ /// <summary>+ /// The localized state label for UI display. Raw Windows states ("Ready",+ /// "Running", ...) are mapped through translations; unknown values are shown+ /// as-is. Computed so it re-resolves when the UI language changes.+ /// </summary>+ public string StateDisplay =>+ State?.ToLowerInvariant() switch+ {+ "running" => Loc.Instance["ScheduledTasks.State.Running"],+ "ready" => Loc.Instance["ScheduledTasks.State.Ready"],+ "disabled" => Loc.Instance["ScheduledTasks.State.Disabled"],+ "queued" => Loc.Instance["ScheduledTasks.State.Queued"],+ _ => State ?? string.Empty,+ };+/// <summary>/// The name of the task./// </summary>diff --git a/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.csindex 19de85e..e7009af 100644--- a/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs+++ b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs@@ -1,6 +1,8 @@using System.IO;using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Domain.Optimizations.Models.StartupManager;@@ -30,7 +32,7 @@ public enum StartupAppLocation/// <summary>/// Represents an application that runs at Windows startup./// </summary>-public partial class StartupApp : ObservableObject+public partial class StartupApp : LocalizedObject{/// <summary>/// The command that runs the application.@@ -101,17 +103,18 @@ public partial class StartupApp : ObservableObject/// Gets a human-readable string for the location./// </summary>public string LocationDisplay =>- Location switch- {- StartupAppLocation.RegistryHKCURun => "Registry (Current User)",- StartupAppLocation.RegistryHKLMRun => "Registry (Local Machine)",- StartupAppLocation.RegistryHKCURunOnce => "Registry RunOnce (Current User)",- StartupAppLocation.RegistryHKLMRunOnce => "Registry RunOnce (Local Machine)",- StartupAppLocation.RegistryHKLMRun32 => "Registry (Local Machine, 32-bit)",- StartupAppLocation.RegistryHKLMRunOnce32 => "Registry RunOnce (Local Machine, 32-bit)",- StartupAppLocation.UserStartupFolder => "Startup Folder (Current User)",- StartupAppLocation.CommonStartupFolder => "Startup Folder (All Users)",- StartupAppLocation.UwpStartupTask => "Microsoft Store App",- _ => PathOrKey,- };+ LocationDisplayKeys.TryGetValue(Location, out var key) ? Loc.Instance[key] : PathOrKey;++ private static readonly Dictionary<StartupAppLocation, string> LocationDisplayKeys = new()+ {+ [StartupAppLocation.RegistryHKCURun] = "Startup.Location.RegistryHKCURun",+ [StartupAppLocation.RegistryHKLMRun] = "Startup.Location.RegistryHKLMRun",+ [StartupAppLocation.RegistryHKCURunOnce] = "Startup.Location.RegistryHKCURunOnce",+ [StartupAppLocation.RegistryHKLMRunOnce] = "Startup.Location.RegistryHKLMRunOnce",+ [StartupAppLocation.RegistryHKLMRun32] = "Startup.Location.RegistryHKLMRun32",+ [StartupAppLocation.RegistryHKLMRunOnce32] = "Startup.Location.RegistryHKLMRunOnce32",+ [StartupAppLocation.UserStartupFolder] = "Startup.Location.UserStartupFolder",+ [StartupAppLocation.CommonStartupFolder] = "Startup.Location.CommonStartupFolder",+ [StartupAppLocation.UwpStartupTask] = "Startup.Location.UwpStartupTask",+ };}diff --git a/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.csindex b424095..194ed21 100644--- a/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs@@ -4,6 +4,7 @@ using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Exceptions;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;namespace optimizerDuck.Domain.Revert.Steps;@@ -56,29 +57,12 @@ public class RegistryRevertStep : IRevertSteppublic string Description =>Action switch{- RevertAction.RestorePrevious => string.Format(- Translations.Revert_Registry_Description_Restore,- Path,- Name ?? "(Default)"- ),- RevertAction.NoPreviousValue => string.Format(- Translations.Revert_Registry_Description_Delete,- Path,- Name ?? "(Default)"- ),- RevertAction.RestoreKey => string.Format(- Translations.Revert_Registry_Description_RestoreKey,- Path- ),- RevertAction.DeleteKey => string.Format(- Translations.Revert_Registry_Description_DeleteKey,- Path- ),- RevertAction.RestoreKeyTree => string.Format(- Translations.Revert_Registry_Description_RestoreKey,- Path- ),- _ => string.Format(Translations.Revert_Registry_Description_RevertUnknown, Path),+ RevertAction.RestorePrevious => Loc.Instance["Revert.Registry.Description.Restore", Path, Name ?? "(Default)"],+ RevertAction.NoPreviousValue => Loc.Instance["Revert.Registry.Description.Delete", Path, Name ?? "(Default)"],+ RevertAction.RestoreKey => Loc.Instance["Revert.Registry.Description.RestoreKey", Path],+ RevertAction.DeleteKey => Loc.Instance["Revert.Registry.Description.DeleteKey", Path],+ RevertAction.RestoreKeyTree => Loc.Instance["Revert.Registry.Description.RestoreKey", Path],+ _ => Loc.Instance["Revert.Registry.Description.RevertUnknown", Path],};/// <inheritdoc />diff --git a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.csindex 9159bd9..dab7e65 100644--- a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs@@ -2,6 +2,7 @@ using Newtonsoft.Json.Linq;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Exceptions;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;namespace optimizerDuck.Domain.Revert.Steps;@@ -26,12 +27,7 @@ public class ScheduledTaskRevertStep : IRevertStep/// <inheritdoc />public string Description =>- string.Format(- OriginalEnabled- ? Translations.Revert_ScheduledTask_Description_Enable- : Translations.Revert_ScheduledTask_Description_Disable,- FullPath- );+ OriginalEnabled ? Loc.Instance["Revert.ScheduledTask.Description.Enable", FullPath] : Loc.Instance["Revert.ScheduledTask.Description.Disable", FullPath];/// <inheritdoc />public Task<bool> ExecuteAsync()diff --git a/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.csindex 2dd91ed..b591c46 100644--- a/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs@@ -3,6 +3,7 @@ using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Exceptions;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;namespace optimizerDuck.Domain.Revert.Steps;@@ -27,11 +28,7 @@ public class ServiceRevertStep : IRevertStep/// <inheritdoc />public string Description =>- string.Format(- Translations.Revert_Service_Description_Restore,- ServiceName,- OriginalStartupType- );+ Loc.Instance["Revert.Service.Description.Restore", ServiceName, OriginalStartupType];/// <inheritdoc />public async Task<bool> ExecuteAsync()diff --git a/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.csindex 436b5e6..bce0b48 100644--- a/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs@@ -3,6 +3,7 @@ using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Exceptions;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;namespace optimizerDuck.Domain.Revert.Steps;@@ -27,7 +28,7 @@ public class ShellRevertStep : IRevertStep/// <inheritdoc />public string Description =>- string.Format(Translations.Revert_Shell_Description_Run, ShellType, Command);+ Loc.Instance["Revert.Shell.Description.Run", ShellType, Command];/// <inheritdoc />public async Task<bool> ExecuteAsync()@@ -40,7 +41,7 @@ public class ShellRevertStep : IRevertStep{Command = Command,Stdout = "",- Stderr = Translations.Revert_Shell_Error_UnknownShellType,+ Stderr = Loc.Instance["Revert.Shell.Error.UnknownShellType"],ExitCode = 1,Duration = TimeSpan.Zero,},@@ -50,7 +51,7 @@ public class ShellRevertStep : IRevertStep{var error = !string.IsNullOrWhiteSpace(result.Stderr)? result.Stderr- : string.Format(Translations.Revert_Shell_Error_CommandFailed, result.ExitCode);+ : Loc.Instance["Revert.Shell.Error.CommandFailed", result.ExitCode];throw new StepExecutionException(error, result.Stderr);}diff --git a/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.csindex 5a92574..b00da7f 100644--- a/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs@@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Exceptions;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;namespace optimizerDuck.Domain.Revert.Steps;@@ -38,7 +39,7 @@ public class UsbPowerRevertStep : IRevertSteppublic string Type => "UsbPower";/// <inheritdoc />- public string Description => Translations.Revert_UsbPower_Description;+ public string Description => Loc.Instance["Revert.UsbPower.Description"];/// <inheritdoc />public async Task<bool> ExecuteAsync()@@ -68,7 +69,7 @@ public class UsbPowerRevertStep : IRevertStep{var error = !string.IsNullOrWhiteSpace(result.Stderr)? result.Stderr- : string.Format(Translations.Revert_UsbPower_Error_CommandFailed, result.ExitCode);+ : Loc.Instance["Revert.UsbPower.Error.CommandFailed", result.ExitCode];throw new StepExecutionException(error, result.Stderr);}diff --git a/optimizerDuck/Domain/UI/OptimizationState.cs b/optimizerDuck/Domain/UI/OptimizationState.csindex a8a6cbe..326ed8a 100644--- a/optimizerDuck/Domain/UI/OptimizationState.cs+++ b/optimizerDuck/Domain/UI/OptimizationState.cs@@ -1,6 +1,7 @@using System.Windows.Threading;using CommunityToolkit.Mvvm.ComponentModel;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Domain.UI;@@ -16,6 +17,30 @@ public partial class OptimizationState : ObservableObjectprivate int _lastDisplayedSeconds = -1;+ static OptimizationState()+ {+ // Static handler held by the Loc singleton: references no instance, so the+ // WeakReference tracking above still allows instances to be collected.+ Loc.Instance.LanguageChanged += OnLanguageChanged;+ }++ private static void OnLanguageChanged(object? sender, LanguageChangedEventArgs e)+ {+ lock (_lock)+ {+ for (var i = _instances.Count - 1; i >= 0; i--)+ {+ if (!_instances[i].TryGetTarget(out var instance))+ {+ _instances.RemoveAt(i);+ continue;+ }++ instance.ForceUpdateRelativeTime();+ }+ }+ }+/// <summary>/// The date and time when the optimization was applied./// </summary>@@ -99,45 +124,49 @@ public partial class OptimizationState : ObservableObject}private void UpdateRelativeTime()+ {+ RelativeTime = ComputeRelativeTime();+ }++ private void ForceUpdateRelativeTime()+ {+ _lastDisplayedSeconds = -1;+ UpdateRelativeTime();+ }++ private string ComputeRelativeTime(){if (AppliedAt == null)- {- RelativeTime = string.Empty;- _lastDisplayedSeconds = -1;- return;- }+ return string.Empty;var ts = DateTime.UtcNow - AppliedAt.Value.ToUniversalTime();var totalSeconds = (int)Math.Floor(ts.TotalSeconds);if (totalSeconds == _lastDisplayedSeconds)- return;+ return RelativeTime ?? string.Empty;_lastDisplayedSeconds = totalSeconds;- RelativeTime = ts switch+ return ts switch{- _ when totalSeconds < 15 => Translations.Common_AppliedJustNow,- _ when totalSeconds < 60 => string.Format(- Translations.Common_AppliedSecondsAgo,- totalSeconds- ),- _ when ts.TotalMinutes < 60 => string.Format(- Translations.Common_AppliedMinutesAgo,+ _ when totalSeconds < 15 => Loc.Instance["Common.AppliedJustNow"],+ _ when totalSeconds < 60 => Loc.Instance["Common.AppliedSecondsAgo", totalSeconds],+ _ when ts.TotalMinutes < 60 => Loc.Instance[+ "Common.AppliedMinutesAgo",(int)Math.Floor(ts.TotalMinutes)- ),- _ when ts.TotalHours < 24 => string.Format(- Translations.Common_AppliedHoursAgo,+ ],+ _ when ts.TotalHours < 24 => Loc.Instance[+ "Common.AppliedHoursAgo",(int)Math.Floor(ts.TotalHours)- ),- _ when ts.TotalDays < 30 => string.Format(- Translations.Common_AppliedDaysAgo,+ ],+ _ when ts.TotalDays < 30 => Loc.Instance[+ "Common.AppliedDaysAgo",(int)Math.Floor(ts.TotalDays)- ),- _ when ts.TotalDays < 365 => string.Format(- Translations.Common_AppliedMonthsAgo,+ ],+ _ when ts.TotalDays < 365 => Loc.Instance[+ "Common.AppliedMonthsAgo",(int)(ts.TotalDays / 30)- ),- _ => string.Format(Translations.Common_AppliedYearsAgo, (int)(ts.TotalDays / 365)),+ ],+ _ => Loc.Instance["Common.AppliedYearsAgo", (int)(ts.TotalDays / 365)],};}diff --git a/optimizerDuck/Domain/UI/OptimizationTags.cs b/optimizerDuck/Domain/UI/OptimizationTags.csindex c77db35..765dd59 100644--- a/optimizerDuck/Domain/UI/OptimizationTags.cs+++ b/optimizerDuck/Domain/UI/OptimizationTags.cs@@ -1,4 +1,5 @@using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using Wpf.Ui.Controls;namespace optimizerDuck.Domain.UI;@@ -79,109 +80,109 @@ public static class OptimizationTagsToDisplayOptimizationTags.Security => new OptimizationTagDisplay{Icon = SymbolRegular.LockClosed24,- Display = Translations.Optimizer_UI_Tags_Security,+ Display = Loc.Instance["Optimizer.UI.Tags.Security"],},OptimizationTags.Privacy => new OptimizationTagDisplay{Icon = SymbolRegular.LockOpen24,- Display = Translations.Optimizer_UI_Tags_Privacy,+ Display = Loc.Instance["Optimizer.UI.Tags.Privacy"],},OptimizationTags.System => new OptimizationTagDisplay{Icon = SymbolRegular.Desktop24,- Display = Translations.Optimizer_UI_Tags_System,+ Display = Loc.Instance["Optimizer.UI.Tags.System"],},OptimizationTags.Performance => new OptimizationTagDisplay{Icon = SymbolRegular.Gauge24,- Display = Translations.Optimizer_UI_Tags_Performance,+ Display = Loc.Instance["Optimizer.UI.Tags.Performance"],},OptimizationTags.Latency => new OptimizationTagDisplay{Icon = SymbolRegular.Clock24,- Display = Translations.Optimizer_UI_Tags_Latency,+ Display = Loc.Instance["Optimizer.UI.Tags.Latency"],},OptimizationTags.Disk => new OptimizationTagDisplay{Icon = SymbolRegular.HardDrive20,- Display = Translations.Optimizer_UI_Tags_Disk,+ Display = Loc.Instance["Optimizer.UI.Tags.Disk"],},OptimizationTags.Ram => new OptimizationTagDisplay{Icon = SymbolRegular.Memory16,- Display = Translations.Optimizer_UI_Tags_Ram,+ Display = Loc.Instance["Optimizer.UI.Tags.Ram"],},OptimizationTags.Display => new OptimizationTagDisplay{Icon = SymbolRegular.VideoClip24,- Display = Translations.Optimizer_UI_Tags_Display,+ Display = Loc.Instance["Optimizer.UI.Tags.Display"],},OptimizationTags.Nvidia => new OptimizationTagDisplay{Icon = SymbolRegular.VideoClip24,- Display = Translations.Optimizer_UI_Tags_Nvidia,+ Display = Loc.Instance["Optimizer.UI.Tags.Nvidia"],},OptimizationTags.Amd => new OptimizationTagDisplay{Icon = SymbolRegular.VideoClip24,- Display = Translations.Optimizer_UI_Tags_Amd,+ Display = Loc.Instance["Optimizer.UI.Tags.Amd"],},OptimizationTags.Intel => new OptimizationTagDisplay{Icon = SymbolRegular.VideoClip24,- Display = Translations.Optimizer_UI_Tags_Intel,+ Display = Loc.Instance["Optimizer.UI.Tags.Intel"],},OptimizationTags.Power => new OptimizationTagDisplay{Icon = SymbolRegular.BatteryCharge24,- Display = Translations.Optimizer_UI_Tags_Power,+ Display = Loc.Instance["Optimizer.UI.Tags.Power"],},OptimizationTags.Network => new OptimizationTagDisplay{Icon = SymbolRegular.NetworkAdapter16,- Display = Translations.Optimizer_UI_Tags_Network,+ Display = Loc.Instance["Optimizer.UI.Tags.Network"],},OptimizationTags.NetworkRequired => new OptimizationTagDisplay{Icon = SymbolRegular.Wifi120,- Display = Translations.Optimizer_UI_Tags_NetworkRequired,+ Display = Loc.Instance["Optimizer.UI.Tags.NetworkRequired"],},OptimizationTags.Audio => new OptimizationTagDisplay{Icon = SymbolRegular.Headphones24,- Display = Translations.Optimizer_UI_Tags_Audio,+ Display = Loc.Instance["Optimizer.UI.Tags.Audio"],},OptimizationTags.Visual => new OptimizationTagDisplay{Icon = SymbolRegular.VideoClip24,- Display = Translations.Optimizer_UI_Tags_Visual,+ Display = Loc.Instance["Optimizer.UI.Tags.Visual"],},OptimizationTags.Windows10Only => new OptimizationTagDisplay{Icon = SymbolRegular.Window16,- Display = Translations.Optimizer_UI_Tags_Windows10Only,+ Display = Loc.Instance["Optimizer.UI.Tags.Windows10Only"],},OptimizationTags.Windows11Only => new OptimizationTagDisplay{Icon = SymbolRegular.Window16,- Display = Translations.Optimizer_UI_Tags_Windows11Only,+ Display = Loc.Instance["Optimizer.UI.Tags.Windows11Only"],},_ => throw new ArgumentOutOfRangeException(nameof(tags)),diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.csindex 970a41d..bdb46da 100644--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs@@ -1338,6 +1338,51 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Choose when to combine taskbar buttons and hide labels across all displays..+ /// </summary>+ internal static string Customize_Preferences_CombineTaskbarButtons_Description {+ get {+ return ResourceManager.GetString("Customize.Preferences.CombineTaskbarButtons.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Combine Taskbar Buttons.+ /// </summary>+ internal static string Customize_Preferences_CombineTaskbarButtons_Name {+ get {+ return ResourceManager.GetString("Customize.Preferences.CombineTaskbarButtons.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Always.+ /// </summary>+ internal static string Customize_Preferences_CombineTaskbarButtons_Options_Always {+ get {+ return ResourceManager.GetString("Customize.Preferences.CombineTaskbarButtons.Options.Always", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Never.+ /// </summary>+ internal static string Customize_Preferences_CombineTaskbarButtons_Options_Never {+ get {+ return ResourceManager.GetString("Customize.Preferences.CombineTaskbarButtons.Options.Never", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to When taskbar is full.+ /// </summary>+ internal static string Customize_Preferences_CombineTaskbarButtons_Options_WhenFull {+ get {+ return ResourceManager.GetString("Customize.Preferences.CombineTaskbarButtons.Options.WhenFull", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Applies dark colors to Windows apps, Settings, and other shell elements../// </summary>@@ -5762,6 +5807,87 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Startup Folder (All Users).+ /// </summary>+ internal static string Startup_Location_CommonStartupFolder {+ get {+ return ResourceManager.GetString("Startup.Location.CommonStartupFolder", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry (Current User).+ /// </summary>+ internal static string Startup_Location_RegistryHKCURun {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKCURun", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry RunOnce (Current User).+ /// </summary>+ internal static string Startup_Location_RegistryHKCURunOnce {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKCURunOnce", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry (Local Machine).+ /// </summary>+ internal static string Startup_Location_RegistryHKLMRun {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKLMRun", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry (Local Machine, 32-bit).+ /// </summary>+ internal static string Startup_Location_RegistryHKLMRun32 {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKLMRun32", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry RunOnce (Local Machine).+ /// </summary>+ internal static string Startup_Location_RegistryHKLMRunOnce {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKLMRunOnce", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Registry RunOnce (Local Machine, 32-bit).+ /// </summary>+ internal static string Startup_Location_RegistryHKLMRunOnce32 {+ get {+ return ResourceManager.GetString("Startup.Location.RegistryHKLMRunOnce32", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Startup Folder (Current User).+ /// </summary>+ internal static string Startup_Location_UserStartupFolder {+ get {+ return ResourceManager.GetString("Startup.Location.UserStartupFolder", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Microsoft Store App.+ /// </summary>+ internal static string Startup_Location_UwpStartupTask {+ get {+ return ResourceManager.GetString("Startup.Location.UwpStartupTask", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to {0} items./// </summary>diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex 8b0f0e3..8314697 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -2108,4 +2108,46 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value><data name="Customize.UI.UnsupportedSettings.Description" xml:space="preserve"><value>Some settings are unavailable on your current system.</value></data>+ <data name="Startup.Location.RegistryHKCURun" xml:space="preserve">+ <value>Registry (Current User)</value>+ </data>+ <data name="Startup.Location.RegistryHKLMRun" xml:space="preserve">+ <value>Registry (Local Machine)</value>+ </data>+ <data name="Startup.Location.RegistryHKCURunOnce" xml:space="preserve">+ <value>Registry RunOnce (Current User)</value>+ </data>+ <data name="Startup.Location.RegistryHKLMRunOnce" xml:space="preserve">+ <value>Registry RunOnce (Local Machine)</value>+ </data>+ <data name="Startup.Location.RegistryHKLMRun32" xml:space="preserve">+ <value>Registry (Local Machine, 32-bit)</value>+ </data>+ <data name="Startup.Location.RegistryHKLMRunOnce32" xml:space="preserve">+ <value>Registry RunOnce (Local Machine, 32-bit)</value>+ </data>+ <data name="Startup.Location.UserStartupFolder" xml:space="preserve">+ <value>Startup Folder (Current User)</value>+ </data>+ <data name="Startup.Location.CommonStartupFolder" xml:space="preserve">+ <value>Startup Folder (All Users)</value>+ </data>+ <data name="Startup.Location.UwpStartupTask" xml:space="preserve">+ <value>Microsoft Store App</value>+ </data>+ <data name="ScheduledTasks.Dialog.Settings" xml:space="preserve">+ <value>Settings</value>+ </data>+ <data name="ScheduledTasks.State.Running" xml:space="preserve">+ <value>Running</value>+ </data>+ <data name="ScheduledTasks.State.Ready" xml:space="preserve">+ <value>Ready</value>+ </data>+ <data name="ScheduledTasks.State.Disabled" xml:space="preserve">+ <value>Disabled</value>+ </data>+ <data name="ScheduledTasks.State.Queued" xml:space="preserve">+ <value>Queued</value>+ </data></root>\ No newline at end of filediff --git a/optimizerDuck/Services/Configuration/LanguageManager.cs b/optimizerDuck/Services/Configuration/LanguageManager.csindex 1a5a52c..f9b0bb3 100644--- a/optimizerDuck/Services/Configuration/LanguageManager.cs+++ b/optimizerDuck/Services/Configuration/LanguageManager.cs@@ -5,59 +5,75 @@ using optimizerDuck.Resources.Languages;namespace optimizerDuck.Services.Configuration;-/// <summary>-/// Provides localization and culture management for the application.-/// Implements <see cref="INotifyPropertyChanged" /> so UI bindings (e.g., FlowDirection) update on culture change.-/// </summary>+/// <summary>Language change event data.</summary>+public sealed class LanguageChangedEventArgs(CultureInfo newCulture) : EventArgs+{+ /// <summary>New language that was applied.</summary>+ public CultureInfo NewCulture { get; } = newCulture;+}++/// <summary>App language manager. Singleton that updates UI when language changes.</summary>public class Loc : INotifyPropertyChanged{- /// <summary>- /// Gets the singleton instance of the localization manager.- /// </summary>+ /// <summary>Single instance used everywhere (Loc.Instance["Key"]). </summary>public static Loc Instance { get; } = new();- /// <summary>- /// Gets the current culture information.- /// </summary>+ /// <summary>Current UI language.</summary>public static CultureInfo CurrentCulture => Translations.Culture;- /// <summary>- /// Gets whether the current culture uses a right-to-left writing system.- /// </summary>+ /// <summary>True if current language is right-to-left (Arabic, Hebrew).</summary>public bool IsRtl => Translations.Culture.TextInfo.IsRightToLeft;- /// <summary>- /// Gets the <see cref="FlowDirection" /> corresponding to the current culture.- /// Returns <see cref="FlowDirection.RightToLeft" /> for RTL languages, otherwise <see cref="FlowDirection.LeftToRight" />.- /// </summary>+ /// <summary>Layout direction for current language (LeftToRight or RightToLeft).</summary>public FlowDirection Direction => IsRtl ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;- /// <summary>- /// Gets the localized string for the specified key.- /// </summary>- /// <param name="key">The resource key to look up.</param>- /// <returns>The localized string or the key itself if not found.</returns>+ /// <summary>Get text for key in current language. Returns key if not found.</summary>public string this[string key] =>Translations.ResourceManager.GetString(key, Translations.Culture) ?? key;- /// <summary>- /// Changes the current culture for localization.- /// </summary>- /// <param name="culture">The new culture to apply.</param>+ /// <summary>Always English, even when UI language changes. Use for logs.</summary>+ public static InvariantStrings Invariant { get; } = new();++ /// <summary>English-only text (neutral resources). Not affected by ChangeCulture.</summary>+ public sealed class InvariantStrings+ {+ /// <summary>Get English text for key.</summary>+ public string this[string key] =>+ Translations.ResourceManager.GetString(key, CultureInfo.InvariantCulture) ?? key;++ /// <summary>Get English text with formatting (string.Format).</summary>+ public string this[string key, params object?[] args] => string.Format(this[key], args);+ }++ /// <summary>Get text with formatting, e.g. Loc.Instance["Key", value].</summary>+ public string this[string key, params object?[] args] => string.Format(this[key], args);++ /// <summary>Occurs when language changes. ViewModels refresh cached text here.</summary>+ public event EventHandler<LanguageChangedEventArgs>? LanguageChanged;++ /// <summary>Subscribe without keeping object alive. Use for ViewModels that can be closed.</summary>+ public static void AddWeakLanguageChangedHandler(+ EventHandler<LanguageChangedEventArgs> handler+ ) =>+ WeakEventManager<Loc, LanguageChangedEventArgs>.AddHandler(+ Instance,+ nameof(LanguageChanged),+ handler+ );++ /// <summary>Change UI language and refresh all text and layout.</summary>public void ChangeCulture(CultureInfo culture){Translations.Culture = culture;OnPropertyChanged(nameof(IsRtl));OnPropertyChanged(nameof(Direction));+ OnPropertyChanged("Item[]");+ LanguageChanged?.Invoke(this, new LanguageChangedEventArgs(culture));}/// <inheritdoc />public event PropertyChangedEventHandler? PropertyChanged;- /// <summary>- /// Raises the <see cref="PropertyChanged" /> event.- /// </summary>- /// <param name="propertyName">The name of the property that changed.</param>protected virtual void OnPropertyChanged(string propertyName){PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));diff --git a/optimizerDuck/Services/Optimization/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.csindex e46cafd..14968f1 100644--- a/optimizerDuck/Services/Optimization/OptimizationService.cs+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs@@ -1,6 +1,7 @@using System.IO;using System.Text.RegularExpressions;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Execution;@@ -8,6 +9,7 @@ using optimizerDuck.Domain.Optimizations.Models;using optimizerDuck.Domain.Revert;using optimizerDuck.Domain.UI;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;using optimizerDuck.Services.Revert;using optimizerDuck.Services.System;@@ -44,7 +46,7 @@ public class OptimizationService(var dialogViewModel = new ProcessingViewModel();var dialog = new ContentDialog{- Title = Translations.RestorePoint_Title,+ Title = Loc.Instance["RestorePoint.Title"],Content = new ProcessingDialog { DataContext = dialogViewModel },IsFooterVisible = false,};@@ -56,7 +58,7 @@ public class OptimizationService(dialogViewModel.ProgressReporter.Report(new ProcessingProgress{- Message = Translations.RestorePoint_Progress_Creating,+ Message = Loc.Instance["RestorePoint.Progress.Creating"],IsIndeterminate = true,});@@ -91,7 +93,7 @@ public class OptimizationService(dialogViewModel.ProgressReporter.Report(new ProcessingProgress{- Message = Translations.RestorePoint_Progress_Enabling,+ Message = Loc.Instance["RestorePoint.Progress.Enabling"],IsIndeterminate = true,});@@ -112,7 +114,7 @@ public class OptimizationService(dialogViewModel.ProgressReporter.Report(new ProcessingProgress{- Message = Translations.RestorePoint_Progress_Retrying,+ Message = Loc.Instance["RestorePoint.Progress.Retrying"],IsIndeterminate = true,});@@ -158,7 +160,7 @@ public class OptimizationService(_logger.LogInformation("Starting apply of {Name} ({Key}) with ID {Id}",- optimization.Name,+ optimization.LogName(),optimization.OptimizationKey,optimization.Id);@@ -166,7 +168,7 @@ public class OptimizationService(progress.Report(new ProcessingProgress{- Message = Translations.Optimization_Apply_Processing,+ Message = Loc.Instance["Optimization.Apply.Processing"],IsIndeterminate = true,});@@ -203,7 +205,7 @@ public class OptimizationService(progress.Report(new ProcessingProgress{- Message = Translations.Optimization_Apply_Completed,+ Message = Loc.Instance["Optimization.Apply.Completed"],IsIndeterminate = false,Value = 1,Total = 1,@@ -225,10 +227,7 @@ public class OptimizationService(var result = new OptimizationResult{Status = status,- Message = string.Format(- Translations.Optimization_Apply_Error_Failed,- optimization.Name- ),+ Message = Loc.Instance["Optimization.Apply.Error.Failed", optimization.Name],Exception = ex,FailedSteps = failedSteps,};@@ -252,7 +251,7 @@ public class OptimizationService({_logger.LogInformation("Starting revert of {Name} ({Key}) with ID {Id}",- optimization.Name,+ optimization.LogName(),optimization.OptimizationKey,optimization.Id);@@ -260,7 +259,7 @@ public class OptimizationService(progress?.Report(new ProcessingProgress{- Message = Translations.Optimization_Revert_Reverting,+ Message = Loc.Instance["Optimization.Revert.Reverting"],IsIndeterminate = true,});@@ -389,7 +388,7 @@ public class OptimizationService(progress?.Report(new ProcessingProgress{- Message = Translations.Optimization_Retry_Processing,+ Message = Loc.Instance["Optimization.Retry.Processing"],IsIndeterminate = true,});@@ -400,12 +399,7 @@ public class OptimizationService(progress?.Report(new ProcessingProgress{- Message = string.Format(- Translations.Optimization_RetryStep_Processing,- step.Name,- processedCount,- total- ),+ Message = Loc.Instance["Optimization.RetryStep.Processing", step.Name, processedCount, total],Value = processedCount,Total = total,}diff --git a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs b/optimizerDuck/Services/Optimization/Providers/RegistryService.csindex 5d76aa7..c18ec8d 100644--- a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs+++ b/optimizerDuck/Services/Optimization/Providers/RegistryService.cs@@ -7,6 +7,7 @@ using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Domain.Revert.Steps;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Services.Optimization.Providers;@@ -113,7 +114,7 @@ public static class RegistryServicecatch (SecurityException ex){TrackRegistryError(- Translations.Service_Registry_Error_AccessDeniedProtectedHive,+ Loc.Invariant["Service.Registry.Error.AccessDeniedProtectedHive"],"Access denied (protected hive)",rootKey,subPath,@@ -124,7 +125,7 @@ public static class RegistryServicecatch (UnauthorizedAccessException ex){TrackRegistryError(- Translations.Service_Registry_Error_UnauthorizedAccess,+ Loc.Invariant["Service.Registry.Error.UnauthorizedAccess"],"Unauthorized access",rootKey,subPath,@@ -135,7 +136,7 @@ public static class RegistryServicecatch (Exception ex){TrackRegistryError(- Translations.Service_Registry_Error_CreateOrOpenSubkeyFailed,+ Loc.Invariant["Service.Registry.Error.CreateOrOpenSubkeyFailed"],"Failed to create/open subkey",rootKey,subPath,@@ -264,11 +265,7 @@ public static class RegistryServiceitem,key =>{- var description = string.Format(- Translations.Service_Registry_Description_Write,- item.Path,- item.Name- );+ var description = Loc.Invariant["Service.Registry.Description.Write", item.Path, item.Name];try{var valueName = NormalizeValueName(item.Name);@@ -308,7 +305,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(Write), true);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,true,revertStep@@ -317,12 +314,8 @@ public static class RegistryService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Common_Error_AccessDenied;- _lastErrorDetail.Value = string.Format(- Translations.Service_Registry_ErrorDetail_AccessDeniedWrite,- item.Path,- item.Name- );+ _lastError.Value = Loc.Invariant["Service.Common.Error.AccessDenied"];+ _lastErrorDetail.Value = Loc.Invariant["Service.Registry.ErrorDetail.AccessDeniedWrite", item.Path, item.Name];ExecutionScope.LogError(null,"Access denied writing {Path}:{Name}",@@ -331,7 +324,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(Write), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -353,7 +346,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(Write), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -381,11 +374,7 @@ public static class RegistryServiceitem,key =>{- var description = string.Format(- Translations.Service_Registry_Description_Delete,- item.Path,- item.Name ?? "(Default)"- );+ var description = Loc.Invariant["Service.Registry.Description.Delete", item.Path, item.Name ?? "(Default)"];try{var valueName = NormalizeValueName(item.Name);@@ -407,7 +396,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(DeleteValue), true);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,true);@@ -429,7 +418,7 @@ public static class RegistryServiceExecutionScope.LogInfo("Deleted registry {Path}:{Name}", item.Path, item.Name!);ExecutionScope.Track(nameof(DeleteValue), true);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,true,revertStep@@ -438,12 +427,8 @@ public static class RegistryService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Common_Error_AccessDenied;- _lastErrorDetail.Value = string.Format(- Translations.Service_Registry_ErrorDetail_AccessDeniedDelete,- item.Path,- item.Name- );+ _lastError.Value = Loc.Invariant["Service.Common.Error.AccessDenied"];+ _lastErrorDetail.Value = Loc.Invariant["Service.Registry.ErrorDetail.AccessDeniedDelete", item.Path, item.Name];ExecutionScope.LogError(null,"Access denied deleting {Path}:{Name}",@@ -452,7 +437,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(DeleteValue), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -474,7 +459,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(DeleteValue), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -499,10 +484,7 @@ public static class RegistryServiceif (!TryParsePath(item.Path, out var rootKey, out var subPath))return false;- var description = string.Format(- Translations.Service_Registry_Description_CreateKey,- item.Path- );+ var description = Loc.Invariant["Service.Registry.Description.CreateKey", item.Path];var createdSubKeys = new List<string>();try@@ -512,7 +494,11 @@ public static class RegistryService{ExecutionScope.LogInfo("Skip create registry {Path} (already exists)", item.Path);ExecutionScope.Track(nameof(CreateSubKey), true);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true);+ ExecutionScope.RecordStep(+ Loc.Invariant["Service.Registry.Name"],+ description,+ true+ );return true;}@@ -529,7 +515,7 @@ public static class RegistryServiceExecutionScope.LogInfo("Created registry key {Path}", item.Path);ExecutionScope.Track(nameof(CreateSubKey), true);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,true,revertStep@@ -538,15 +524,12 @@ public static class RegistryService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Common_Error_AccessDenied;- _lastErrorDetail.Value = string.Format(- Translations.Service_Registry_ErrorDetail_AccessDeniedCreateKey,- item.Path- );+ _lastError.Value = Loc.Invariant["Service.Common.Error.AccessDenied"];+ _lastErrorDetail.Value = Loc.Invariant["Service.Registry.ErrorDetail.AccessDeniedCreateKey", item.Path];ExecutionScope.LogError(null, "Access denied creating {Path}", item.Path);ExecutionScope.Track(nameof(CreateSubKey), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -563,7 +546,7 @@ public static class RegistryServiceExecutionScope.LogError(ex, "Failed to create registry {Path}", item.Path);ExecutionScope.Track(nameof(CreateSubKey), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -585,10 +568,7 @@ public static class RegistryServiceif (!TryParsePath(item.Path, out var rootKey, out var subPath))return false;- var description = string.Format(- Translations.Service_Registry_Description_DeleteKey,- item.Path- );+ var description = Loc.Invariant["Service.Registry.Description.DeleteKey", item.Path];try{@@ -597,17 +577,18 @@ public static class RegistryService{ExecutionScope.LogInfo("Skip delete registry key {Path} (not found)", item.Path);ExecutionScope.Track(nameof(DeleteSubKeyTree), true);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true);+ ExecutionScope.RecordStep(+ Loc.Invariant["Service.Registry.Name"],+ description,+ true+ );return true;}var (subSteps, backupComplete) = BackupRegistryTree(key, item.Path);if (!backupComplete){- var msg = string.Format(- Translations.Service_Registry_Error_BackupTruncated,- item.Path- );+ var msg = Loc.Invariant["Service.Registry.Error.BackupTruncated", item.Path];_lastError.Value = _lastErrorDetail.Value = msg;ExecutionScope.LogError(null,@@ -616,7 +597,7 @@ public static class RegistryService);ExecutionScope.Track(nameof(DeleteSubKeyTree), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -638,7 +619,7 @@ public static class RegistryServiceExecutionScope.LogInfo("Deleted registry key tree {Path}", item.Path);ExecutionScope.Track(nameof(DeleteSubKeyTree), true);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,true,revertStep@@ -647,15 +628,12 @@ public static class RegistryService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Registry_Error_AccessDeniedProtectedHive;- _lastErrorDetail.Value = string.Format(- Translations.Service_Registry_ErrorDetail_AccessDeniedDeleteKeyTree,- item.Path- );+ _lastError.Value = Loc.Invariant["Service.Registry.Error.AccessDeniedProtectedHive"];+ _lastErrorDetail.Value = Loc.Invariant["Service.Registry.ErrorDetail.AccessDeniedDeleteKeyTree", item.Path];ExecutionScope.LogError(null, "Access denied deleting {Path}", item.Path);ExecutionScope.Track(nameof(DeleteSubKeyTree), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -672,7 +650,7 @@ public static class RegistryServiceExecutionScope.LogError(ex, "Failed to delete subkey tree {Path}", item.Path);ExecutionScope.Track(nameof(DeleteSubKeyTree), false);ExecutionScope.RecordStep(- Translations.Service_Registry_Name,+ Loc.Invariant["Service.Registry.Name"],description,false,null,@@ -843,7 +821,13 @@ public static class RegistryServiceExecutionScope.Track(nameof(RegistryService), false);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, path, false, null, uiReason);+ ExecutionScope.RecordStep(+ Loc.Invariant["Service.Registry.Name"],+ path,+ false,+ null,+ uiReason+ );}// walks each segment of the subkey path, creating missing segments one by onediff --git a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.csindex 73cd62a..9778f95 100644--- a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs+++ b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs@@ -3,6 +3,7 @@ using Microsoft.Win32.TaskScheduler;using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.Revert.Steps;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.UI;using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;using Task = Microsoft.Win32.TaskScheduler.Task;@@ -44,17 +45,14 @@ public static class ScheduledTaskService{_lastError.Value = _lastErrorDetail.Value = null;- var description = string.Format(- Translations.Service_ScheduledTask_Description_Disable,- fullPath- );+ var description = Loc.Invariant["Service.ScheduledTask.Description.Disable", fullPath];try{using var ts = new TaskService();var task =ts.GetTask(fullPath)?? throw new InvalidOperationException(- string.Format(Translations.ScheduledTasks_Error_TaskNotFound, fullPath)+ Loc.Instance["ScheduledTasks.Error.TaskNotFound", fullPath]);var wasEnabled = task.Enabled;@@ -72,7 +70,7 @@ public static class ScheduledTaskServiceExecutionScope.LogInfo("Disabled task {Path}", fullPath);ExecutionScope.Track(nameof(DisableTask), true);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,true,revertStep@@ -81,15 +79,12 @@ public static class ScheduledTaskService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Common_Error_AccessDenied;- _lastErrorDetail.Value = string.Format(- Translations.Service_ScheduledTask_ErrorDetail_AccessDeniedDisable,- fullPath- );+ _lastError.Value = Loc.Invariant["Service.Common.Error.AccessDenied"];+ _lastErrorDetail.Value = Loc.Invariant["Service.ScheduledTask.ErrorDetail.AccessDeniedDisable", fullPath];ExecutionScope.LogError(null, "Access denied disabling task {Path}", fullPath);ExecutionScope.Track(nameof(DisableTask), false);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,false,null,@@ -106,7 +101,7 @@ public static class ScheduledTaskServiceExecutionScope.LogError(ex, "Failed to disable task {Path}", fullPath);ExecutionScope.Track(nameof(DisableTask), false);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,false,null,@@ -125,17 +120,14 @@ public static class ScheduledTaskService{_lastError.Value = _lastErrorDetail.Value = null;- var description = string.Format(- Translations.Service_ScheduledTask_Description_Enable,- fullPath- );+ var description = Loc.Invariant["Service.ScheduledTask.Description.Enable", fullPath];try{using var ts = new TaskService();var task =ts.GetTask(fullPath)?? throw new InvalidOperationException(- string.Format(Translations.ScheduledTasks_Error_TaskNotFound, fullPath)+ Loc.Instance["ScheduledTasks.Error.TaskNotFound", fullPath]);var wasEnabled = task.Enabled;@@ -153,7 +145,7 @@ public static class ScheduledTaskServiceExecutionScope.LogInfo("Enabled task {Path}", fullPath);ExecutionScope.Track(nameof(EnableTask), true);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,true,revertStep@@ -162,15 +154,12 @@ public static class ScheduledTaskService}catch (UnauthorizedAccessException){- _lastError.Value = Translations.Service_Common_Error_AccessDenied;- _lastErrorDetail.Value = string.Format(- Translations.Service_ScheduledTask_ErrorDetail_AccessDeniedEnable,- fullPath- );+ _lastError.Value = Loc.Invariant["Service.Common.Error.AccessDenied"];+ _lastErrorDetail.Value = Loc.Invariant["Service.ScheduledTask.ErrorDetail.AccessDeniedEnable", fullPath];ExecutionScope.LogError(null, "Access denied enabling task {Path}", fullPath);ExecutionScope.Track(nameof(EnableTask), false);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,false,null,@@ -187,7 +176,7 @@ public static class ScheduledTaskServiceExecutionScope.LogError(ex, "Failed to enable task {Path}", fullPath);ExecutionScope.Track(nameof(EnableTask), false);ExecutionScope.RecordStep(- Translations.Service_ScheduledTask_Name,+ Loc.Invariant["Service.ScheduledTask.Name"],description,false,null,@@ -251,7 +240,7 @@ public static class ScheduledTaskServicevar task =ts.GetTask(fullPath)?? throw new InvalidOperationException(- string.Format(Translations.ScheduledTasks_Error_TaskNotFound, fullPath)+ Loc.Instance["ScheduledTasks.Error.TaskNotFound", fullPath]);task.Run();ExecutionScope.LogInfo("Started task {Path}", fullPath);@@ -279,7 +268,7 @@ public static class ScheduledTaskServicevar task =ts.GetTask(fullPath)?? throw new InvalidOperationException(- string.Format(Translations.ScheduledTasks_Error_TaskNotFound, fullPath)+ Loc.Instance["ScheduledTasks.Error.TaskNotFound", fullPath]);task.Stop();ExecutionScope.LogInfo("Stopped task {Path}", fullPath);@@ -329,7 +318,7 @@ public static class ScheduledTaskServicevar task =ts.GetTask(fullPath)?? throw new InvalidOperationException(- string.Format(Translations.ScheduledTasks_Error_TaskNotFound, fullPath)+ Loc.Instance["ScheduledTasks.Error.TaskNotFound", fullPath]);var folderPath = task.Folder.Path;ts.GetFolder(folderPath).DeleteTask(task.Name);diff --git a/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs b/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.csindex c292910..d28b9da 100644--- a/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs+++ b/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs@@ -5,6 +5,7 @@ using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Domain.Revert.Steps;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Services.Optimization.Providers;@@ -132,11 +133,7 @@ public static class ServiceProcessService{_lastError.Value = _lastErrorDetail.Value = null;- var description = string.Format(- Translations.Service_Service_Description_Change,- item.Name,- item.StartupType- );+ var description = Loc.Invariant["Service.Service.Description.Change", item.Name, item.StartupType];var sw = Stopwatch.StartNew();try@@ -146,14 +143,11 @@ public static class ServiceProcessServiceif (notFound){sw.Stop();- var skipDescription = string.Format(- Translations.Service_Service_Info_SkippedNotFound,- item.Name- );+ var skipDescription = Loc.Invariant["Service.Service.Info.SkippedNotFound", item.Name];ExecutionScope.LogInfo("[SERVICE][{Name}] not found, skipping", item.Name);ExecutionScope.Track(nameof(ChangeServiceStartupTypeAsync), true);ExecutionScope.RecordStep(- Translations.Service_Service_Name,+ Loc.Invariant["Service.Service.Name"],skipDescription,true,null@@ -171,7 +165,7 @@ public static class ServiceProcessService);ExecutionScope.Track(nameof(ChangeServiceStartupTypeAsync), false);ExecutionScope.RecordStep(- Translations.Service_Service_Name,+ Loc.Invariant["Service.Service.Name"],description,false,null@@ -219,7 +213,7 @@ public static class ServiceProcessServiceExecutionScope.Track(nameof(ChangeServiceStartupTypeAsync), true);ExecutionScope.RecordStep(- Translations.Service_Service_Name,+ Loc.Invariant["Service.Service.Name"],description,true,revertStep@@ -227,7 +221,7 @@ public static class ServiceProcessServicereturn true;}- _lastError.Value = Translations.Service_Service_Error_ChangeStartupTypeFailed;+ _lastError.Value = Loc.Invariant["Service.Service.Error.ChangeStartupTypeFailed"];ExecutionScope.LogInfo("[SERVICE][{Name}][FAIL][D={Duration}] startup -> {StartupType}",item.Name,@@ -236,7 +230,7 @@ public static class ServiceProcessService);ExecutionScope.Track(nameof(ChangeServiceStartupTypeAsync), false);ExecutionScope.RecordStep(- Translations.Service_Service_Name,+ Loc.Invariant["Service.Service.Name"],description,false,null,@@ -248,11 +242,7 @@ public static class ServiceProcessService}catch (Exception ex){- _lastError.Value = string.Format(- Translations.Service_Service_Error_ExceptionOccurred,- item.Name,- ex.Message- );+ _lastError.Value = Loc.Invariant["Service.Service.Error.ExceptionOccurred", item.Name, ex.Message];_lastErrorDetail.Value = ex.ToString();ExecutionScope.LogError(@@ -263,7 +253,7 @@ public static class ServiceProcessService);ExecutionScope.Track(nameof(ChangeServiceStartupTypeAsync), false);ExecutionScope.RecordStep(- Translations.Service_Service_Name,+ Loc.Invariant["Service.Service.Name"],description,false,null,diff --git a/optimizerDuck/Services/Optimization/Providers/ShellService.cs b/optimizerDuck/Services/Optimization/Providers/ShellService.csindex 20d0587..454cd5e 100644--- a/optimizerDuck/Services/Optimization/Providers/ShellService.cs+++ b/optimizerDuck/Services/Optimization/Providers/ShellService.cs@@ -7,6 +7,7 @@ using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.Optimizations.Models.Services;using optimizerDuck.Domain.Revert.Steps;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Services.Optimization.Providers;@@ -23,9 +24,9 @@ public sealed class ShellPolicypublic Func<ShellResult, string?> ErrorFactory { get; init; } =r =>r.ExitCode == -1 // if timed out use Error.TimedOut- ? Translations.Service_Shell_Error_TimedOut+ ? Loc.Instance["Service.Shell.Error.TimedOut"]: string.IsNullOrWhiteSpace(r.Stderr) // else check stderr, if empty use exitcode, else use raw stderr- ? string.Format(Translations.Service_Shell_Error_ExitCode, r.ExitCode)+ ? Loc.Instance["Service.Shell.Error.ExitCode", r.ExitCode]: r.Stderr;/// <summary>Creates a policy with a custom success function and optional error factory.</summary>@@ -266,7 +267,7 @@ public static class ShellServicevar error = success ? null : policy.ErrorFactory(result);ExecutionScope.RecordStep(- Translations.Service_Shell_Name,+ Loc.Invariant["Service.Shell.Name"],fullCommandForUser,success,revertStep,@@ -305,7 +306,7 @@ public static class ShellService};ExecutionScope.RecordStep(- Translations.Service_Shell_Name,+ Loc.Invariant["Service.Shell.Name"],fullCommandForUser,false,revertStep,@@ -510,7 +511,7 @@ public static class ShellServicevar error = success ? null : policy.ErrorFactory(result);ExecutionScope.RecordStep(- Translations.Service_Shell_Name,+ Loc.Invariant["Service.Shell.Name"],fullCommandForUser,success,revertStep,@@ -554,7 +555,7 @@ public static class ShellService};ExecutionScope.RecordStep(- Translations.Service_Shell_Name,+ Loc.Invariant["Service.Shell.Name"],fullCommandForUser,false,revertStep,diff --git a/optimizerDuck/Services/Revert/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.csindex dc0b0cb..3521e0c 100644--- a/optimizerDuck/Services/Revert/RevertManager.cs+++ b/optimizerDuck/Services/Revert/RevertManager.cs@@ -12,6 +12,7 @@ using optimizerDuck.Domain.Optimizations.Models;using optimizerDuck.Domain.Revert;using optimizerDuck.Domain.UI;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.Services.Revert;@@ -81,7 +82,7 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggereturn new RevertResult{Success = false,- Message = string.Format(Translations.Revert_Error_NoDataFound, optimization.Name),+ Message = Loc.Instance["Revert.Error.NoDataFound", optimization.Name],};var failedSteps = new List<OperationStepResult>();@@ -95,12 +96,7 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeprogress?.Report(new ProcessingProgress{- Message = string.Format(- Translations.Optimization_Revert_ExecutingStep,- remaining,- total,- step.Type- ),+ Message = Loc.Instance["Optimization.Revert.ExecutingStep", remaining, total, step.Type],Value = remaining,Total = total,}@@ -109,7 +105,7 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggetry{if (!await step.ExecuteAsync().ConfigureAwait(false))- throw new Exception(Translations.Revert_Error_StepFailed);+ throw new Exception(Loc.Instance["Revert.Error.StepFailed"]);}catch (Exception ex){@@ -163,17 +159,10 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeAllStepsFailed = failedSteps.Count == total,Message =failedSteps.Count == total- ? string.Format(- Translations.Optimization_Revert_Error_Failed,- optimization.Name- )+ ? Loc.Instance["Optimization.Revert.Error.Failed", optimization.Name]: failedSteps.Count > 0- ? string.Format(- Translations.Optimization_Revert_Error_FailedWithSteps,- optimization.Name,- failedSteps.Count- )- : string.Format(Translations.Optimization_Revert_Success, optimization.Name),+ ? Loc.Instance["Optimization.Revert.Error.FailedWithSteps", optimization.Name, failedSteps.Count]+ : Loc.Instance["Optimization.Revert.Success", optimization.Name],FailedSteps = failedSteps,};}diff --git a/optimizerDuck/Services/System/SystemInfoService.cs b/optimizerDuck/Services/System/SystemInfoService.csindex 4cb74f3..c22b1e7 100644--- a/optimizerDuck/Services/System/SystemInfoService.cs+++ b/optimizerDuck/Services/System/SystemInfoService.cs@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;using Microsoft.Win32;using Microsoft.Win32.SafeHandles;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using WmiEnumerationOptions = System.Management.EnumerationOptions;namespace optimizerDuck.Services.System;@@ -56,8 +57,8 @@ public sealed record GpuInfo/// <summary>A sentinel value representing an unknown GPU.</summary>public static readonly GpuInfo Unknown = new(){- Name = Translations.Common_Unknown,- DriverVersion = Translations.Common_Unknown,+ Name = Loc.Instance["Common.Unknown"],+ DriverVersion = Loc.Instance["Common.Unknown"],Vendor = GpuVendor.Unknown,};@@ -106,10 +107,10 @@ public sealed record CpuInfo/// <summary>A sentinel value representing an unknown CPU.</summary>public static readonly CpuInfo Unknown = new(){- Name = Translations.Common_Unknown,- Manufacturer = Translations.Common_Unknown,+ Name = Loc.Instance["Common.Unknown"],+ Manufacturer = Loc.Instance["Common.Unknown"],Vendor = CpuVendor.Unknown,- Architecture = Translations.Common_Unknown,+ Architecture = Loc.Instance["Common.Unknown"],Cores = 0,Threads = 0,MaxClockMHz = 0,@@ -346,14 +347,14 @@ public sealed record OsInfo/// <summary>A sentinel value representing unknown OS information.</summary>public static readonly OsInfo Unknown = new(){- Name = Translations.Common_Unknown,- Version = Translations.Common_Unknown,- BuildNumber = Translations.Common_Unknown,- Edition = Translations.Common_Unknown,- Architecture = Translations.Common_Unknown,- DeviceType = Translations.Common_Unknown,- InstallDate = Translations.Common_Unknown,- LastBootUpTime = Translations.Common_Unknown,+ Name = Loc.Instance["Common.Unknown"],+ Version = Loc.Instance["Common.Unknown"],+ BuildNumber = Loc.Instance["Common.Unknown"],+ Edition = Loc.Instance["Common.Unknown"],+ Architecture = Loc.Instance["Common.Unknown"],+ DeviceType = Loc.Instance["Common.Unknown"],+ InstallDate = Loc.Instance["Common.Unknown"],+ LastBootUpTime = Loc.Instance["Common.Unknown"],};/// <summary>@@ -405,11 +406,11 @@ public sealed record BiosInfo/// <summary>A sentinel value representing unknown BIOS information.</summary>public static readonly BiosInfo Unknown = new(){- Manufacturer = Translations.Common_Unknown,- Version = Translations.Common_Unknown,- ReleaseDate = Translations.Common_Unknown,- SmbiosVersion = Translations.Common_Unknown,- SerialNumber = Translations.Common_Unknown,+ Manufacturer = Loc.Instance["Common.Unknown"],+ Version = Loc.Instance["Common.Unknown"],+ ReleaseDate = Loc.Instance["Common.Unknown"],+ SmbiosVersion = Loc.Instance["Common.Unknown"],+ SerialNumber = Loc.Instance["Common.Unknown"],};/// <summary>@@ -602,7 +603,7 @@ internal static class WmiHelperpublic static string GetString(ManagementObject mo, string property, string? fallback = null){- fallback ??= Translations.Common_Unknown;+ fallback ??= Loc.Instance["Common.Unknown"];try{var value = mo[property];@@ -729,8 +730,8 @@ internal static class CpuProvidertry{// ── Fast path: Registry ──────────────────────────────────────- var name = Translations.Common_Unknown;- var manufacturer = Translations.Common_Unknown;+ var name = Loc.Instance["Common.Unknown"];+ var manufacturer = Loc.Instance["Common.Unknown"];var currentMHz = 0;using (@@ -1712,7 +1713,8 @@ internal static class GpuProvidernew GpuInfo{Name = name,- DriverVersion = wmiMatch?.DriverVersion ?? Translations.Common_Unknown,+ DriverVersion =+ wmiMatch?.DriverVersion ?? Loc.Instance["Common.Unknown"],Vendor = vendor,MemoryMB = memoryMB > 0 ? memoryMB : null,DeviceId = wmiMatch?.DeviceId,@@ -1970,9 +1972,9 @@ internal static class OsProvidertry{// ── Fast path: Registry ──────────────────────────────────────- var buildNumber = Translations.Common_Unknown;- var edition = Translations.Common_Unknown;- var installDate = Translations.Common_Unknown;+ var buildNumber = Loc.Instance["Common.Unknown"];+ var edition = Loc.Instance["Common.Unknown"];+ var installDate = Loc.Instance["Common.Unknown"];var displayVersion = "";using (@@ -2009,7 +2011,7 @@ internal static class OsProvidervar name = $"Windows {version}";// ── Targeted WMI: only for LastBootUpTime ────────────────────- var lastBoot = Translations.Common_Unknown;+ var lastBoot = Loc.Instance["Common.Unknown"];var os = WmiHelper.GetFirst("SELECT LastBootUpTime FROM Win32_OperatingSystem");if (os != null){@@ -2086,7 +2088,7 @@ internal static class OsProviderswitch (type){case 8 or 9 or 10 or 11 or 14 or 30 or 31 or 32:- return Translations.Dashboard_SystemInfo_Os_DeviceType_Laptop;+ return Loc.Instance["Dashboard.SystemInfo.Os.DeviceType.Laptop"];case >= 1and <= 7@@ -2096,10 +2098,10 @@ internal static class OsProviderand <= 29or >= 33and <= 36:- return Translations.Dashboard_SystemInfo_Os_DeviceType_Desktop;+ return Loc.Instance["Dashboard.SystemInfo.Os.DeviceType.Desktop"];}- return Translations.Common_Unknown;+ return Loc.Instance["Common.Unknown"];}private static string FormatWmiDateTime(string wmiDate)diff --git a/optimizerDuck/Services/UI/DiskCleanupService.cs b/optimizerDuck/Services/UI/DiskCleanupService.csindex f91cd29..6f03868 100644--- a/optimizerDuck/Services/UI/DiskCleanupService.cs+++ b/optimizerDuck/Services/UI/DiskCleanupService.cs@@ -1,6 +1,7 @@using System.IO;using Microsoft.Extensions.Logging;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;using Wpf.Ui.Controls;using CleanupItem = optimizerDuck.Domain.Optimizations.Models.Cleanup.CleanupItem;@@ -30,48 +31,48 @@ public class DiskCleanupService(ILogger<DiskCleanupService> logger)new CleanupItem{Id = "TempFiles",- Name = Translations.DiskCleanup_Item_TempFiles,- Description = Translations.DiskCleanup_Item_TempFiles_Description,+ NameKey = "DiskCleanup.Item.TempFiles",+ DescriptionKey = "DiskCleanup.Item.TempFiles.Description",Path = Path.GetTempPath(),Icon = SymbolRegular.Document24,},new CleanupItem{Id = "SystemTemp",- Name = Translations.DiskCleanup_Item_SystemTemp,- Description = Translations.DiskCleanup_Item_SystemTemp_Description,+ NameKey = "DiskCleanup.Item.SystemTemp",+ DescriptionKey = "DiskCleanup.Item.SystemTemp.Description",Path = Path.Combine(windowsDir, "Temp"),Icon = SymbolRegular.DocumentError24,},new CleanupItem{Id = "WindowsUpdate",- Name = Translations.DiskCleanup_Item_WindowsUpdate,- Description = Translations.DiskCleanup_Item_WindowsUpdate_Description,+ NameKey = "DiskCleanup.Item.WindowsUpdate",+ DescriptionKey = "DiskCleanup.Item.WindowsUpdate.Description",Path = Path.Combine(windowsDir, @"SoftwareDistribution\Download"),Icon = SymbolRegular.ArrowDownload24,},new CleanupItem{Id = "Prefetch",- Name = Translations.DiskCleanup_Item_Prefetch,- Description = Translations.DiskCleanup_Item_Prefetch_Description,+ NameKey = "DiskCleanup.Item.Prefetch",+ DescriptionKey = "DiskCleanup.Item.Prefetch.Description",Path = Path.Combine(windowsDir, "Prefetch"),Icon = SymbolRegular.Flash24,},new CleanupItem{Id = "Thumbnails",- Name = Translations.DiskCleanup_Item_Thumbnails,- Description = Translations.DiskCleanup_Item_Thumbnails_Description,+ NameKey = "DiskCleanup.Item.Thumbnails",+ DescriptionKey = "DiskCleanup.Item.Thumbnails.Description",Path = Path.Combine(localAppData, @"Microsoft\Windows\Explorer"),Icon = SymbolRegular.Image24,},new CleanupItem{Id = "RecycleBin",- Name = Translations.DiskCleanup_Item_RecycleBin,- Description = Translations.DiskCleanup_Item_RecycleBin_Description,+ NameKey = "DiskCleanup.Item.RecycleBin",+ DescriptionKey = "DiskCleanup.Item.RecycleBin.Description",Path = "Clear-RecycleBin -Force -ErrorAction SilentlyContinue",Icon = SymbolRegular.Delete24,IsCommand = true,@@ -79,16 +80,16 @@ public class DiskCleanupService(ILogger<DiskCleanupService> logger)new CleanupItem{Id = "ErrorReports",- Name = Translations.DiskCleanup_Item_ErrorReports,- Description = Translations.DiskCleanup_Item_ErrorReports_Description,+ NameKey = "DiskCleanup.Item.ErrorReports",+ DescriptionKey = "DiskCleanup.Item.ErrorReports.Description",Path = Path.Combine(localAppData, "CrashDumps"),Icon = SymbolRegular.Bug24,},new CleanupItem{Id = "OldWindowsInstallation",- Name = Translations.DiskCleanup_Item_OldWindowsInstallation,- Description = Translations.DiskCleanup_Item_OldWindowsInstallation_Description,+ NameKey = "DiskCleanup.Item.OldWindowsInstallation",+ DescriptionKey = "DiskCleanup.Item.OldWindowsInstallation.Description",Path = Path.Combine(systemDrive, "Windows.old"),Icon = SymbolRegular.Building24,},diff --git a/optimizerDuck/UI/Controls/TaskStateBadge.xaml.cs b/optimizerDuck/UI/Controls/TaskStateBadge.xaml.csindex 14b81c6..a489e89 100644--- a/optimizerDuck/UI/Controls/TaskStateBadge.xaml.cs+++ b/optimizerDuck/UI/Controls/TaskStateBadge.xaml.cs@@ -1,5 +1,6 @@using System.Windows;using System.Windows.Controls;+using optimizerDuck.Services.Configuration;namespace optimizerDuck.UI.Controls;@@ -51,8 +52,16 @@ public partial class TaskStateBadge : UserControlpublic TaskStateBadge(){InitializeComponent();++ // The effective state text is cached in a DependencyProperty, so it must be+ // recomputed when the UI language changes. Weak subscription avoids keeping+ // the control alive through the Loc singleton.+ Loc.AddWeakLanguageChangedHandler(OnLanguageChanged);}+ private void OnLanguageChanged(object? sender, LanguageChangedEventArgs e) =>+ UpdateEffectiveStateDisplay();+public string? State{get => (string?)GetValue(StateProperty);@@ -103,8 +112,8 @@ public partial class TaskStateBadge : UserControlif (IsEnabledState.HasValue){EffectiveStateDisplay = IsEnabledState.Value- ? optimizerDuck.Resources.Languages.Translations.Common_Toggle_On- : optimizerDuck.Resources.Languages.Translations.Common_Toggle_Off;+ ? Loc.Instance["Common.Toggle.On"]+ : Loc.Instance["Common.Toggle.Off"];}else{diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xamlindex 477d18d..b7fa190 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml@@ -124,7 +124,7 @@<ui:TextBlockMargin="0,0,0,4"FontTypography="Caption"- Text="Settings" />+ Text="{ext:Loc ScheduledTasks.Dialog.Settings}" /><BorderMargin="0,0,0,12"Padding="{StaticResource CardPadding}"diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDeleteDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDeleteDialog.xamlindex f0812b8..81d1e09 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDeleteDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDeleteDialog.xaml@@ -60,7 +60,7 @@IsDisabledState="{Binding IsDisabledState}"IsReady="{Binding IsReady}"IsRunning="{Binding IsRunning}"- State="{Binding State}" />+ State="{Binding StateDisplay}" /></DockPanel><ui:TextBlockdiff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xamlindex 64eba6f..0ddcfc5 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml@@ -57,7 +57,7 @@IsDisabledState="{Binding IsDisabledState}"IsReady="{Binding IsReady}"IsRunning="{Binding IsRunning}"- State="{Binding State}" />+ State="{Binding StateDisplay}" /></DockPanel><ui:TextBlockdiff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xamlindex d2103f1..06c7879 100644--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml@@ -203,7 +203,7 @@IsDisabledState="{Binding IsDisabledState}"IsReady="{Binding IsReady}"IsRunning="{Binding IsRunning}"- State="{Binding State}" />+ State="{Binding StateDisplay}" /></DockPanel><!-- Row 2: Description -->diff --git a/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs b/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.csindex be7eb14..448f25b 100644--- a/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs@@ -2,6 +2,7 @@ using System.Windows;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Conditions;@@ -17,7 +18,7 @@ public partial class CustomizeItemViewModel(ICustomizeSetting setting,ILoggerFactory loggerFactory,IRegistryWatcher registryWatcher-) : ObservableObject, IDisposable+) : LocalizedObject, IDisposable{private readonly ILogger<CustomizeItemViewModel> _logger =loggerFactory.CreateLogger<CustomizeItemViewModel>();@@ -43,8 +44,12 @@ public partial class CustomizeItemViewModel(public SymbolRegular Icon => setting.Icon;- [ObservableProperty]- private string _description = setting.Description;+ /// <summary>+ /// Computed so grouped section headers, filters and bindings always re-resolve+ /// against the current culture, even when a parent handler rebuilds sections+ /// before this item is notified.+ /// </summary>+ public string Description => setting.Description;[ObservableProperty]private bool _isEnabled;@@ -52,14 +57,9 @@ public partial class CustomizeItemViewModel([ObservableProperty]private bool _isLoading;- [ObservableProperty]- private string _name = setting.Name;+ public string Name => setting.Name;- [ObservableProperty]- private string _section = setting.Section;-- [ObservableProperty]- private string _categoryName = string.Empty;+ public string Section => setting.Section;[ObservableProperty]private object? _currentValue;@@ -222,7 +222,7 @@ public partial class CustomizeItemViewModel(_logger.LogWarning(ex,"RegistryWatcher: failed to refresh state for {Setting}",- setting.Name+ setting.LogName());}}@@ -319,7 +319,7 @@ public partial class CustomizeItemViewModel(_logger.LogInformation("Apply {Value} for {Setting} ({Key})",valueToApply,- setting.Name,+ setting.LogName(),setting.FeatureKey);@@ -344,7 +344,7 @@ public partial class CustomizeItemViewModel(}catch (Exception ex){- _logger.LogError(ex, "Failed to apply {SettingName}", setting.Name);+ _logger.LogError(ex, "Failed to apply {SettingName}", setting.LogName());}}}diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.csindex ebcdc44..b2ce6be 100644--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs@@ -3,10 +3,12 @@ using System.IO;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Optimizations.Models;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Revert;using Wpf.Ui;using Wpf.Ui.Controls;@@ -17,7 +19,7 @@ public partial class OptimizationDetailsViewModel(IOptimization optimization,ISnackbarService snackbarService,ILogger logger-) : ObservableObject+) : LocalizedObject{public IOptimization Optimization { get; } = optimization;@@ -43,8 +45,8 @@ public partial class OptimizationDetailsViewModel(catch (Exception ex){snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.csindex 815d3f9..656ba20 100644--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs@@ -1,10 +1,11 @@using System.Collections.ObjectModel;using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.Optimizations.Models;namespace optimizerDuck.UI.ViewModels.Dialogs;-public class OptimizationResultDialogViewModel : ObservableObject+public class OptimizationResultDialogViewModel : LocalizedObject{public OptimizationResultDialogViewModel(IEnumerable<OperationStepResult> failedSteps){diff --git a/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.csindex a879a26..d33604d 100644--- a/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs@@ -1,9 +1,10 @@using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using optimizerDuck.Domain.UI;namespace optimizerDuck.UI.ViewModels.Dialogs;-public partial class ProcessingViewModel : ObservableObject+public partial class ProcessingViewModel : LocalizedObject{[ObservableProperty]private bool _isIndeterminate;diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.csindex c9f31fb..5ca299c 100644--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs@@ -183,11 +183,8 @@ public partial class OptimizationCategoryViewModel : ViewModeloptimization.OptimizationKey);_snackbarService.Show(- Translations.Optimization_Toggle_Snackbar_Error_Title,- string.Format(- Translations.Optimization_Toggle_Snackbar_Error_Message,- ex.Message- ),+ Loc.Instance["Optimization.Toggle.Snackbar.Error.Title"],+ Loc.Instance["Optimization.Toggle.Snackbar.Error.Message", ex.Message],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -379,7 +376,7 @@ public partial class OptimizationCategoryViewModel : ViewModel{Title = BuildDialogTitle(optimization),Content = dialogContent,- CloseButtonText = Translations.Button_Ok,+ CloseButtonText = Loc.Instance["Button.Ok"],};var result = await _contentDialogService.ShowAsync(dialog, CancellationToken.None);}@@ -598,8 +595,8 @@ public partial class OptimizationCategoryViewModel : ViewModel{Title = BuildDialogTitle(optimization),Content = dialogContent,- PrimaryButtonText = Translations.Button_Retry,- CloseButtonText = Translations.Button_Cancel,+ PrimaryButtonText = Loc.Instance["Button.Retry"],+ CloseButtonText = Loc.Instance["Button.Cancel"],};var result = await _contentDialogService.ShowAsync(dialog, CancellationToken.None);@@ -715,18 +712,15 @@ public partial class OptimizationCategoryViewModel : ViewModelif (restorePointCreated && showSuccess)finalMessage +="\n"- + string.Format(- Translations.RestorePoint_Snackbar_Success_Message,- Shared.RestorePointName- );+ + Loc.Instance["RestorePoint.Snackbar.Success.Message", Shared.RestorePointName];if (notificationState == OperationNotificationState.Success){if (showSuccess)_snackbarService.Show(operation == OptimizationOperation.Apply- ? Translations.Optimization_Apply_Snackbar_Success_Title- : Translations.Optimization_Revert_Snackbar_Success_Title,+ ? Loc.Instance["Optimization.Apply.Snackbar.Success.Title"]+ : Loc.Instance["Optimization.Revert.Snackbar.Success.Title"],finalMessage,ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.CheckmarkCircle24, Filled = true },@@ -737,8 +731,8 @@ public partial class OptimizationCategoryViewModel : ViewModel{_snackbarService.Show(operation == OptimizationOperation.Apply- ? Translations.Optimization_Apply_Snackbar_Error_Title- : Translations.Optimization_Revert_Snackbar_Error_Title,+ ? Loc.Instance["Optimization.Apply.Snackbar.Error.Title"]+ : Loc.Instance["Optimization.Revert.Snackbar.Error.Title"],finalMessage,ControlAppearance.Caution,new SymbolIcon { Symbol = SymbolRegular.Warning24, Filled = true },@@ -749,8 +743,8 @@ public partial class OptimizationCategoryViewModel : ViewModel{_snackbarService.Show(operation == OptimizationOperation.Apply- ? Translations.Optimization_Apply_Snackbar_Error_Title- : Translations.Optimization_Revert_Snackbar_Error_Title,+ ? Loc.Instance["Optimization.Apply.Snackbar.Error.Title"]+ : Loc.Instance["Optimization.Revert.Snackbar.Error.Title"],finalMessage,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -768,12 +762,12 @@ public partial class OptimizationCategoryViewModel : ViewModelvar dialogContent = new RestorePointDialog();var dialog = new ContentDialog{- Title = Translations.RestorePoint_Title,+ Title = Loc.Instance["RestorePoint.Title"],Content = dialogContent,- PrimaryButtonText = Translations.Button_Ok,- SecondaryButtonText = Translations.Button_Skip,- CloseButtonText = Translations.Button_Cancel,+ PrimaryButtonText = Loc.Instance["Button.Ok"],+ SecondaryButtonText = Loc.Instance["Button.Skip"],+ CloseButtonText = Loc.Instance["Button.Cancel"],};var result = await _contentDialogService.ShowAsync(dialog, CancellationToken.None);@@ -800,11 +794,8 @@ public partial class OptimizationCategoryViewModel : ViewModelif (!_appOptionsMonitor.CurrentValue.Optimize.ShowCompletionNotification){_snackbarService.Show(- Translations.RestorePoint_Snackbar_Success_Title,- string.Format(- Translations.RestorePoint_Snackbar_Success_Message,- Shared.RestorePointName- ),+ Loc.Instance["RestorePoint.Snackbar.Success.Title"],+ Loc.Instance["RestorePoint.Snackbar.Success.Message", Shared.RestorePointName],ControlAppearance.Success,new SymbolIcon{@@ -821,8 +812,8 @@ public partial class OptimizationCategoryViewModel : ViewModelcase RestorePointResult.FrequencyLimitReached:_snackbarService.Show(- Translations.RestorePoint_Snackbar_Error_Title,- Translations.RestorePoint_Snackbar_Warning_LimitReached,+ Loc.Instance["RestorePoint.Snackbar.Error.Title"],+ Loc.Instance["RestorePoint.Snackbar.Warning.LimitReached"],ControlAppearance.Caution,new SymbolIcon { Symbol = SymbolRegular.Warning24, Filled = true },TimeSpan.FromSeconds(5)@@ -833,8 +824,8 @@ public partial class OptimizationCategoryViewModel : ViewModelcase RestorePointResult.Failed:default:_snackbarService.Show(- Translations.RestorePoint_Snackbar_Error_Title,- Translations.RestorePoint_Snackbar_Error_Message,+ Loc.Instance["RestorePoint.Snackbar.Error.Title"],+ Loc.Instance["RestorePoint.Snackbar.Error.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -845,17 +836,17 @@ public partial class OptimizationCategoryViewModel : ViewModelvar failedMessage =resultState == RestorePointResult.FrequencyLimitReached- ? Translations.RestorePoint_Snackbar_Warning_LimitReached+ ? Loc.Instance["RestorePoint.Snackbar.Warning.LimitReached"]: "";var failedResult = await _contentDialogService.ShowSimpleDialogAsync(new SimpleContentDialogCreateOptions{- Title = Translations.RestorePoint_Snackbar_Error_Title,+ Title = Loc.Instance["RestorePoint.Snackbar.Error.Title"],Content =- failedMessage + $"\n{Translations.RestorePoint_Snackbar_Error_Message}",+ failedMessage + $"\n{Loc.Instance["RestorePoint.Snackbar.Error.Message"]}",- PrimaryButtonText = Translations.Button_Skip,- CloseButtonText = Translations.Button_Cancel,+ PrimaryButtonText = Loc.Instance["Button.Skip"],+ CloseButtonText = Loc.Instance["Button.Cancel"],},CancellationToken.None);@@ -869,8 +860,8 @@ public partial class OptimizationCategoryViewModel : ViewModel{_logger.LogError(e, "Failed to create restore point");_snackbarService.Show(- Translations.RestorePoint_Snackbar_Error_Title,- Translations.RestorePoint_Snackbar_Error_Message,+ Loc.Instance["RestorePoint.Snackbar.Error.Title"],+ Loc.Instance["RestorePoint.Snackbar.Error.Message"],ControlAppearance.Caution,new SymbolIcon { Symbol = SymbolRegular.Warning24, Filled = true },TimeSpan.FromSeconds(5)diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.csindex 24e8a3b..e53b762 100644--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;using optimizerDuck.Domain.Optimizations.Models.Bloatware;using optimizerDuck.Domain.UI;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;using optimizerDuck.Services.UI;using optimizerDuck.UI.Dialogs;@@ -200,10 +201,10 @@ public partial class BloatwareViewModel : ViewModelvar askForConfirmationDialog = new ContentDialog{- Title = string.Format(Translations.BloatwareDialog_Confirmation_Title, SelectedCount),+ Title = Loc.Instance["BloatwareDialog.Confirmation.Title", SelectedCount],Content = new BloatwareConfirmationDialog { DataContext = confirmationViewModel },- PrimaryButtonText = Translations.Button_Ok,- CloseButtonText = Translations.Button_Cancel,+ PrimaryButtonText = Loc.Instance["Button.Ok"],+ CloseButtonText = Loc.Instance["Button.Cancel"],};var result = await _contentDialogService.ShowAsync(@@ -219,10 +220,10 @@ public partial class BloatwareViewModel : ViewModelvar warningViewModel = new BloatwareConfirmationDialogViewModel(unusualPackages);var warningDialog = new ContentDialog{- Title = Translations.BloatwareDialog_UnusualWarning_Title,+ Title = Loc.Instance["BloatwareDialog.UnusualWarning.Title"],Content = new BloatwareWarningDialog { DataContext = warningViewModel },- PrimaryButtonText = Translations.Button_Ok,- CloseButtonText = Translations.Button_Cancel,+ PrimaryButtonText = Loc.Instance["Button.Ok"],+ CloseButtonText = Loc.Instance["Button.Cancel"],};var warningResult = await _contentDialogService.ShowAsync(@@ -236,7 +237,7 @@ public partial class BloatwareViewModel : ViewModelvar viewModel = new ProcessingViewModel();var dialog = new ContentDialog{- Title = string.Format(Translations.BloatwareDialog_Title, toRemove.Count),+ Title = Loc.Instance["BloatwareDialog.Title", toRemove.Count],Content = new ProcessingDialog { DataContext = viewModel },IsFooterVisible = false,};@@ -256,12 +257,7 @@ public partial class BloatwareViewModel : ViewModelviewModel.ProgressReporter.Report(new ProcessingProgress{- Message = string.Format(- Translations.BloatwareDialog_Removing,- item.Name,- i + 1,- toRemove.Count- ),+ Message = Loc.Instance["BloatwareDialog.Removing", item.Name, i + 1, toRemove.Count],Total = toRemove.Count,Value = i,}diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.csindex 6d71158..7dae1d8 100644--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs@@ -1,5 +1,5 @@using System.Collections.ObjectModel;-using System.ComponentModel;+using System.Globalization;using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;@@ -25,14 +25,12 @@ public partial class CustomizeCategoryViewModel : ViewModel[ObservableProperty]private ApplicationTheme _currentApplicationTheme = ApplicationTheme.Unknown;- [ObservableProperty]- private string _categoryDescription = string.Empty;+ public string CategoryDescription => _currentCategory?.Description ?? string.Empty;[ObservableProperty]private SymbolRegular _categoryIcon;- [ObservableProperty]- private string _categoryName = string.Empty;+ public string CategoryName => _currentCategory?.Name ?? string.Empty;[ObservableProperty]private bool _isLoading = true;@@ -52,8 +50,8 @@ public partial class CustomizeCategoryViewModel : ViewModel[ObservableProperty]private int _unsupportedSettingsCount;- [ObservableProperty]- private string _unsupportedSettingsHeader = string.Empty;+ public string UnsupportedSettingsHeader =>+ Loc.Instance["Customize.UI.UnsupportedSettings.Header", UnsupportedSettingsCount];[ObservableProperty]private int _selectedSortByIndex;@@ -79,8 +77,6 @@ public partial class CustomizeCategoryViewModel : ViewModel_systemInfoService = systemInfoService;_logger = loggerFactory.CreateLogger<CustomizeCategoryViewModel>();- CategoryName = _currentCategory.Name;- CategoryDescription = _currentCategory.Description;CategoryIcon = _currentCategory.Icon;CurrentApplicationTheme = ApplicationThemeManager.GetAppTheme();@@ -146,10 +142,6 @@ public partial class CustomizeCategoryViewModel : ViewModelUnsupportedSections = GroupIntoSections(_unsupportedSettings);UnsupportedSettingsCount = _unsupportedSettings.Count;HasUnsupportedSettings = _unsupportedSettings.Count > 0;- UnsupportedSettingsHeader = string.Format(- Loc.Instance["Customize.UI.UnsupportedSettings.Header"],- UnsupportedSettingsCount- );}/// <summary>@@ -163,9 +155,9 @@ public partial class CustomizeCategoryViewModel : ViewModelreturn new ObservableCollection<CustomizeSection>(settings.GroupBy(f =>- string.IsNullOrEmpty(f.Section) ? Translations.Common_Other : f.Section+ string.IsNullOrEmpty(f.Section) ? Loc.Instance["Common.Other"] : f.Section)- .OrderBy(g => g.Key == Translations.Common_Other ? 1 : 0)+ .OrderBy(g => g.Key == Loc.Instance["Common.Other"] ? 1 : 0).ThenBy(g => g.Key).Select(g => new CustomizeSection{@@ -190,7 +182,6 @@ public partial class CustomizeCategoryViewModel : ViewModelApplicationThemeManager.Changed += OnThemeChanged;_systemInfoService.SnapshotRefreshed += OnSnapshotRefreshed;- Loc.Instance.PropertyChanged += OnCultureChanged;return base.OnNavigatedToAsync();}@@ -199,7 +190,6 @@ public partial class CustomizeCategoryViewModel : ViewModel{ApplicationThemeManager.Changed -= OnThemeChanged;_systemInfoService.SnapshotRefreshed -= OnSnapshotRefreshed;- Loc.Instance.PropertyChanged -= OnCultureChanged;return base.OnNavigatedFromAsync();}@@ -212,7 +202,11 @@ public partial class CustomizeCategoryViewModel : ViewModelprivate void OnSnapshotRefreshed(object? sender, SystemSnapshot snapshot) =>ReEvaluateConditions(snapshot);- private void OnCultureChanged(object? sender, PropertyChangedEventArgs e) =>+ /// <summary>+ /// Re-evaluates every condition and rebuilds the filtered/unsupported partitions+ /// when the UI language changes. Marshalled to the UI thread by <see cref="UiThread"/>.+ /// </summary>+ protected override void OnLanguageChanged(CultureInfo newCulture) =>ReEvaluateConditions(_systemInfoService.Snapshot);private void ReEvaluateConditions(SystemSnapshot snapshot)diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.csindex 12cee43..60971cf 100644--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs@@ -2,6 +2,8 @@ using System.Collections.ObjectModel;using System.Reflection;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;+using optimizerDuck.Common.Extensions;+using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Services.Customize;using Wpf.Ui;@@ -32,25 +34,30 @@ public partial class CustomizeViewModel : ViewModelawait _registry.EnsurePreloadedAsync().ConfigureAwait(false);- var categoryViewModels = new ObservableCollection<CustomizeCategoryItemViewModel>();+ ReloadCategories();+ IsLoading = false;+ }+ private void ReloadCategories()+ {+ var categoryViewModels = new ObservableCollection<CustomizeCategoryItemViewModel>();foreach (var category in _registry.Categories)+ {categoryViewModels.Add(new CustomizeCategoryItemViewModel{- Name = category.Name,- Description = category.Description,- Icon = category.Icon,+ Source = category,CategoryType = category.GetType(),+ Icon = category.Icon,PageType = category.GetType().GetCustomAttribute<CustomizeCategoryAttribute>()?.PageType,});+ }Categories = categoryViewModels;- IsLoading = false;}[RelayCommand]@@ -61,19 +68,23 @@ public partial class CustomizeViewModel : ViewModel}}-public partial class CustomizeCategoryItemViewModel : ObservableObject+public partial class CustomizeCategoryItemViewModel : LocalizedObject{[ObservableProperty]private Type? _categoryType;- [ObservableProperty]- private string _description = string.Empty;+ /// <summary>+ /// The category whose display strings this card forwards. Set at construction+ /// time; <see cref="Name" /> and <see cref="Description" /> re-resolve on every+ /// culture change.+ /// </summary>+ public ICustomizeCategory? Source { get; set; }- [ObservableProperty]- private SymbolRegular _icon;+ public string Description => Source?.Description ?? string.Empty;+ public string Name => Source?.Name ?? string.Empty;[ObservableProperty]- private string _name = string.Empty;+ private SymbolRegular _icon;[ObservableProperty]private Type? _pageType;diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.csindex a1cb9c5..1a52e77 100644--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;using optimizerDuck.Common.Helpers;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;using Wpf.Ui;using Wpf.Ui.Appearance;@@ -146,8 +147,8 @@ public partial class DashboardViewModel : ViewModelcatch (Exception ex){_snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -202,8 +203,8 @@ public partial class DashboardViewModel : ViewModelcatch (Exception ex){_snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -241,8 +242,8 @@ public partial class DashboardViewModel : ViewModelcatch (Exception ex){_snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -272,8 +273,8 @@ public partial class DashboardViewModel : ViewModelHasSystemInfoLoadFailed = true;_logger.LogError(ex, "Failed to load system information");_snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -315,8 +316,8 @@ public partial class DashboardViewModel : ViewModelcatch (Exception ex){_snackbarService.Show(- Translations.Snackbar_OpenLinkFailed_Title,- Translations.Snackbar_OpenLinkFailed_Message,+ Loc.Instance["Snackbar.OpenLinkFailed.Title"],+ Loc.Instance["Snackbar.OpenLinkFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)diff --git a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.csindex 768a05a..3bfdd96 100644--- a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.UI;using optimizerDuck.UI.Dialogs;using optimizerDuck.UI.ViewModels.Dialogs;@@ -145,12 +146,8 @@ public partial class DiskCleanupViewModel(sw.Stop();snackbarService.Show(- Translations.DiskCleanup_Complete_Title,- string.Format(- Translations.DiskCleanup_Complete_Message,- CleanupItem.FormatBytes(freedBytes),- $"{sw.Elapsed.TotalSeconds:0.0}s"- ),+ Loc.Instance["DiskCleanup.Complete.Title"],+ Loc.Instance["DiskCleanup.Complete.Message", CleanupItem.FormatBytes(freedBytes), $"{sw.Elapsed.TotalSeconds:0.0}s"],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.CheckmarkCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -168,8 +165,8 @@ public partial class DiskCleanupViewModel({logger.LogError(ex, "Failed to clean item {ItemId}", item.Id);snackbarService.Show(- Translations.DiskCleanup_Error_Title,- Translations.DiskCleanup_Error_Message,+ Loc.Instance["DiskCleanup.Error.Title"],+ Loc.Instance["DiskCleanup.Error.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -194,12 +191,7 @@ public partial class DiskCleanupViewModel(if (selectedItems.Count == 0)return;- var summaryText = string.Format(- Translations.DiskCleanup_Dialog_Confirmation_Summary,- TotalSelectedSizeFormatted,- SelectedCount,- TotalSelectedFileCount- );+ var summaryText = Loc.Instance["DiskCleanup.Dialog.Confirmation.Summary", TotalSelectedSizeFormatted, SelectedCount, TotalSelectedFileCount];var dialogViewModel = new DiskCleanupConfirmationDialogViewModel(selectedItems,@@ -207,16 +199,10 @@ public partial class DiskCleanupViewModel();var dialog = new ContentDialog{- Title = string.Format(- Translations.DiskCleanup_Dialog_Confirmation_Title,- SelectedCount- ),+ Title = Loc.Instance["DiskCleanup.Dialog.Confirmation.Title", SelectedCount],Content = new DiskCleanupConfirmationDialog { DataContext = dialogViewModel },- PrimaryButtonText = string.Format(- Translations.DiskCleanup_Button_CleanSelected,- TotalSelectedSizeFormatted- ),- CloseButtonText = Translations.Common_Cancel,+ PrimaryButtonText = Loc.Instance["DiskCleanup.Button.CleanSelected", TotalSelectedSizeFormatted],+ CloseButtonText = Loc.Instance["Common.Cancel"],};var result = await contentDialogService.ShowAsync(dialog, CancellationToken.None);@@ -235,12 +221,8 @@ public partial class DiskCleanupViewModel(item.IsSelected = false;snackbarService.Show(- Translations.DiskCleanup_Complete_Title,- string.Format(- Translations.DiskCleanup_Complete_Message,- CleanupItem.FormatBytes(freedBytes),- $"{sw.Elapsed.TotalSeconds:0.0}s"- ),+ Loc.Instance["DiskCleanup.Complete.Title"],+ Loc.Instance["DiskCleanup.Complete.Message", CleanupItem.FormatBytes(freedBytes), $"{sw.Elapsed.TotalSeconds:0.0}s"],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.CheckmarkCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -256,8 +238,8 @@ public partial class DiskCleanupViewModel({logger.LogError(ex, "Failed to clean selected items");snackbarService.Show(- Translations.DiskCleanup_Error_Title,- Translations.DiskCleanup_Error_Message,+ Loc.Instance["DiskCleanup.Error.Title"],+ Loc.Instance["DiskCleanup.Error.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -330,8 +312,8 @@ public partial class DiskCleanupViewModel({logger.LogError(ex, "Failed to open folder: {Path}", item.Path);snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(3)diff --git a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.csindex bb5ed6c..2cdd5dd 100644--- a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs@@ -1,5 +1,8 @@using System.Collections.ObjectModel;using System.Reflection;+using System.Windows.Controls;+using System.Windows.Data;+using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;using optimizerDuck.Services.Optimization;using Wpf.Ui.Controls;@@ -15,19 +18,35 @@ public class OptimizeViewModel(OptimizationRegistry optimizationService) : ViewMprotected override async Task InitializeOnceAsync(){await optimizationService.EnsurePreloadedAsync().ConfigureAwait(true);+ ReloadCategories();+ OptimizationsLoaded?.Invoke();+ }+ private void ReloadCategories()+ {+ OptimizationCategories.Clear();foreach (var category in optimizationService.OptimizationCategories)- OptimizationCategories.Add(- new NavigationViewItem+ {+ var item = new NavigationViewItem+ {+ TargetPageType = category+ .GetType()+ .GetCustomAttribute<OptimizationCategoryAttribute>()!+ .PageType,+ };++ // Bind Content instead of assigning it: categories are LocalizedObjects,+ // so the label re-resolves automatically on culture change.+ item.SetBinding(+ ContentControl.ContentProperty,+ new Binding(nameof(IOptimizationCategory.Name)){- Content = category.Name,- TargetPageType = category- .GetType()- .GetCustomAttribute<OptimizationCategoryAttribute>()!- .PageType,+ Source = category,+ Mode = BindingMode.OneWay,});- OptimizationsLoaded?.Invoke();+ OptimizationCategories.Add(item);+ }}}diff --git a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.csindex e0e7a85..c9913f3 100644--- a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.Optimization.Providers;using optimizerDuck.Services.System;using optimizerDuck.UI.Dialogs;@@ -117,9 +118,9 @@ public partial class ScheduledTasksViewModel : ViewModel_snackbarService.Show(task.IsEnabled- ? Translations.ScheduledTasks_Snackbar_Enabled_Title- : Translations.ScheduledTasks_Snackbar_Disabled_Title,- string.Format(Translations.ScheduledTasks_Snackbar_Toggle_Message, task.Name),+ ? Loc.Instance["ScheduledTasks.Snackbar.Enabled.Title"]+ : Loc.Instance["ScheduledTasks.Snackbar.Disabled.Title"],+ Loc.Instance["ScheduledTasks.Snackbar.Toggle.Message", task.Name],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.CheckmarkCircle24, Filled = true },TimeSpan.FromSeconds(3)@@ -137,7 +138,7 @@ public partial class ScheduledTasksViewModel : ViewModeltask.PropertyChanged += Task_PropertyChanged;_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],ex.Message,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -160,8 +161,8 @@ public partial class ScheduledTasksViewModel : ViewModel_logger.LogInformation("Ran task {Name} ({Path})", task.Name, task.FullPath);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Run_Title,- string.Format(Translations.ScheduledTasks_Snackbar_Run_Message, task.Name),+ Loc.Instance["ScheduledTasks.Snackbar.Run.Title"],+ Loc.Instance["ScheduledTasks.Snackbar.Run.Message", task.Name],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.Play24, Filled = true },TimeSpan.FromSeconds(3)@@ -173,7 +174,7 @@ public partial class ScheduledTasksViewModel : ViewModel{var error =ScheduledTaskService.LastError- ?? Translations.ScheduledTasks_Error_TaskNotFound;+ ?? Loc.Instance["ScheduledTasks.Error.TaskNotFound"];_logger.LogError("Failed to run task {Name} ({Path}): {Error}",task.Name,@@ -182,7 +183,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],error,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -200,7 +201,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],ex.Message,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -223,8 +224,8 @@ public partial class ScheduledTasksViewModel : ViewModel_logger.LogInformation("Stopped task {Name} ({Path})", task.Name, task.FullPath);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Stop_Title,- string.Format(Translations.ScheduledTasks_Snackbar_Stop_Message, task.Name),+ Loc.Instance["ScheduledTasks.Snackbar.Stop.Title"],+ Loc.Instance["ScheduledTasks.Snackbar.Stop.Message", task.Name],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.Stop24, Filled = true },TimeSpan.FromSeconds(3)@@ -236,7 +237,7 @@ public partial class ScheduledTasksViewModel : ViewModel{var error =ScheduledTaskService.LastError- ?? Translations.ScheduledTasks_Error_TaskNotFound;+ ?? Loc.Instance["ScheduledTasks.Error.TaskNotFound"];_logger.LogError("Failed to stop task {Name} ({Path}): {Error}",task.Name,@@ -245,7 +246,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],error,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -263,7 +264,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],ex.Message,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -280,10 +281,10 @@ public partial class ScheduledTasksViewModel : ViewModelvar dialog = new ContentDialog{- Title = Translations.ScheduledTasks_Dialog_DeleteTitle,+ Title = Loc.Instance["ScheduledTasks.Dialog.DeleteTitle"],Content = new ScheduledTaskDeleteDialog { DataContext = task },- PrimaryButtonText = Translations.Common_Delete,- CloseButtonText = Translations.Common_Cancel,+ PrimaryButtonText = Loc.Instance["Common.Delete"],+ CloseButtonText = Loc.Instance["Common.Cancel"],};var result = await _contentDialogService.ShowAsync(dialog, CancellationToken.None);@@ -301,8 +302,8 @@ public partial class ScheduledTasksViewModel : ViewModelApplyFilter();_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Delete_Title,- string.Format(Translations.ScheduledTasks_Snackbar_Delete_Message, task.Name),+ Loc.Instance["ScheduledTasks.Snackbar.Delete.Title"],+ Loc.Instance["ScheduledTasks.Snackbar.Delete.Message", task.Name],ControlAppearance.Success,new SymbolIcon { Symbol = SymbolRegular.Delete24, Filled = true },TimeSpan.FromSeconds(3)@@ -312,7 +313,7 @@ public partial class ScheduledTasksViewModel : ViewModel{var error =ScheduledTaskService.LastError- ?? Translations.ScheduledTasks_Error_TaskNotFound;+ ?? Loc.Instance["ScheduledTasks.Error.TaskNotFound"];_logger.LogError("Failed to delete task {Name} ({Path}): {Error}",task.Name,@@ -321,7 +322,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],error,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -339,7 +340,7 @@ public partial class ScheduledTasksViewModel : ViewModel);_snackbarService.Show(- Translations.ScheduledTasks_Snackbar_Error_Title,+ Loc.Instance["ScheduledTasks.Snackbar.Error.Title"],ex.Message,ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },@@ -359,7 +360,7 @@ public partial class ScheduledTasksViewModel : ViewModel{Title = task.Name,Content = dialogContent,- CloseButtonText = Translations.Button_Ok,+ CloseButtonText = Loc.Instance["Button.Ok"],};await _contentDialogService.ShowAsync(dialog, CancellationToken.None);diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.csindex 6ae8a63..1618e27 100644--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs@@ -103,12 +103,12 @@ public partial class SettingsViewModel({var dialog = new ContentDialog{- Title = Translations.Dialog_AreYouSure_Title,+ Title = Loc.Instance["Dialog.AreYouSure.Title"],Content = content,- PrimaryButtonText = Translations.Button_Clear,+ PrimaryButtonText = Loc.Instance["Button.Clear"],PrimaryButtonAppearance = ControlAppearance.Danger,- CloseButtonText = Translations.Button_Cancel,+ CloseButtonText = Loc.Instance["Button.Cancel"],DefaultButton = ContentDialogButton.Close,MaxWidth = 500,@@ -156,8 +156,8 @@ public partial class SettingsViewModel(catch (Exception ex){snackbarService.Show(- Translations.Snackbar_OpenFailed_Title,- Translations.Snackbar_OpenFailed_Message,+ Loc.Instance["Snackbar.OpenFailed.Title"],+ Loc.Instance["Snackbar.OpenFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -170,7 +170,7 @@ public partial class SettingsViewModel(private async Task ClearDownloads(){var result = await ConfirmationDialogAsync(- Translations.Settings_ClearDownloads_Description+ Loc.Instance["Settings.ClearDownloads.Description"]);if (result == ContentDialogResult.Primary)OptimizationService.ClearDownloads(logger);@@ -180,7 +180,7 @@ public partial class SettingsViewModel(private async Task ClearAllRevertData(){var result = await ConfirmationDialogAsync(- Translations.Settings_ClearRevertData_Description+ Loc.Instance["Settings.ClearRevertData.Description"]);if (result == ContentDialogResult.Primary){@@ -250,8 +250,8 @@ public partial class SettingsViewModel(catch (Exception ex){snackbarService.Show(- Translations.Snackbar_OpenLinkFailed_Title,- Translations.Snackbar_OpenLinkFailed_Message,+ Loc.Instance["Snackbar.OpenLinkFailed.Title"],+ Loc.Instance["Snackbar.OpenLinkFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -347,8 +347,8 @@ public partial class SettingsViewModel(catch (Exception ex){snackbarService.Show(- Translations.Snackbar_OpenLinkFailed_Title,- Translations.Snackbar_OpenLinkFailed_Message,+ Loc.Instance["Snackbar.OpenLinkFailed.Title"],+ Loc.Instance["Snackbar.OpenLinkFailed.Message"],ControlAppearance.Danger,new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },TimeSpan.FromSeconds(5)@@ -385,22 +385,8 @@ public partial class SettingsViewModel(if (value == Loc.CurrentCulture.Name)return;- _ = SafeFireAndForgetAsync(async () =>- {- try- {- await contentDialogService.ShowAlertAsync(- Translations.Settings_LanguageChanged_Title,- Translations.Settings_LanguageChanged_Description,- Translations.Button_Ok,- CancellationToken.None- );- }- catch (Exception ex)- {- logger.LogError(ex, "Failed to show language changed dialog");- }- });+ // Apply the new culture immediately so the entire UI refreshes without restart.+ Loc.Instance.ChangeCulture(new CultureInfo(value));}partial void OnCurrentApplicationThemeChanged(diff --git a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.csindex 9c983af..c6b6072 100644--- a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.Configuration;using optimizerDuck.Services.System;using optimizerDuck.Services.UI;using optimizerDuck.UI.Dialogs;@@ -175,7 +176,7 @@ public partial class StartupManagerViewModel : ViewModel{Title = task.TaskName,Content = new StartupTaskDetailsPanel(task),- CloseButtonText = Translations.Button_Ok,+ CloseButtonText = Loc.Instance["Button.Ok"],};await _contentDialogService.ShowAsync(dialog, CancellationToken.None);diff --git a/optimizerDuck/UI/ViewModels/ViewModel.cs b/optimizerDuck/UI/ViewModels/ViewModel.csindex 80591df..3d8d264 100644--- a/optimizerDuck/UI/ViewModels/ViewModel.cs+++ b/optimizerDuck/UI/ViewModels/ViewModel.cs@@ -1,4 +1,5 @@using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.Common.Extensions;using Wpf.Ui.Abstractions.Controls;namespace optimizerDuck.UI.ViewModels;@@ -16,7 +17,7 @@ namespace optimizerDuck.UI.ViewModels;/// to react to page transitions./// </para>/// </remarks>-public abstract class ViewModel : ObservableValidator, INavigationAware+public abstract class ViewModel : LocalizedObject, INavigationAware{private bool _isInitialized;diff --git a/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs b/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.csindex 04aaec7..70e33f6 100644--- a/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs@@ -1,11 +1,12 @@using System.Diagnostics;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;+using optimizerDuck.Common.Extensions;using optimizerDuck.Common.Helpers;namespace optimizerDuck.UI.ViewModels.Windows;-public partial class MainWindowViewModel : ObservableObject+public partial class MainWindowViewModel : LocalizedObject{/// <summary>/// Gets the application version displayed in the title bar.diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Windows/MainWindow.xaml.csindex ba368ff..1cd3de5 100644--- a/optimizerDuck/UI/Windows/MainWindow.xaml.cs+++ b/optimizerDuck/UI/Windows/MainWindow.xaml.cs@@ -69,10 +69,10 @@ public partial class MainWindow : IWindowvar legalDialog = new LegalDialog();var dialog = new ContentDialog{- Title = Translations.LegalDialog_Title,+ Title = Loc.Instance["LegalDialog.Title"],Content = legalDialog,- PrimaryButtonText = Translations.Button_Accept,- CloseButtonText = Translations.Button_Close,+ PrimaryButtonText = Loc.Instance["Button.Accept"],+ CloseButtonText = Loc.Instance["Button.Close"],DefaultButton = ContentDialogButton.Primary,};