Added missing localization strings

Author: d2dyno1

SecureFolderFS.AvaloniaUI/ValueConverters/VaultHealthStateToStringConverter.cs

@@ -1,7 +1,8 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
+using Avalonia.Data.Converters;
 using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Extensions;
+using System;
+using System.Globalization;
 
 namespace SecureFolderFS.AvaloniaUI.ValueConverters
 {
@@ -17,9 +18,9 @@ internal sealed class VaultHealthStateToStringConverter : IValueConverter
             // TODO: Localize
             return vaultHealthState switch
             {
-                VaultHealthState.Healthy => "No problems found",
-                VaultHealthState.NeedsAttention => "Needs attention",
-                VaultHealthState.Error => "Problems found",
+                VaultHealthState.Healthy => "HealthNoProblems".ToLocalized(),
+                VaultHealthState.NeedsAttention => "HealthAttention".ToLocalized(),
+                VaultHealthState.Error => "HealthProblems".ToLocalized(),
                 _ => throw new ArgumentOutOfRangeException(nameof(vaultHealthState))
             };
         }

SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls.Banners
 {
@@ -30,7 +31,7 @@ public DateTime LastChecked
 
         public UpdateBannerViewModel()
         {
-            _UpdateText = "Latest version installed";
+            _UpdateText = "LatestVersionInstalled".ToLocalized();
             UpdateService.StateChanged += UpdateService_StateChanged;
         }
 
@@ -52,9 +53,9 @@ public void Report(double value)
             var rounded = (int)Math.Round(value);
 
             if (rounded == 100)
-                UpdateText = "Installing...";
+                UpdateText = "Installing".ToLocalized();
             else
-                UpdateText = $"Downloading {rounded}%";
+                UpdateText = string.Format("Downloading".ToLocalized(), rounded);
         }
 
         private void UpdateService_StateChanged(object? sender, EventArgs e)
@@ -64,7 +65,7 @@ private void UpdateService_StateChanged(object? sender, EventArgs e)
                 return;
 
             InfoBarViewModel.IsOpen = true;
-            InfoBarViewModel.Title = "Error";
+            InfoBarViewModel.Title = "Error".ToLocalized();
             InfoBarViewModel.CanBeClosed = true;
             InfoBarViewModel.Message = GetMessageForUpdateState(args.UpdateState);
             InfoBarViewModel.InfoBarSeverity = InfoBarSeverityType.Error;
@@ -87,7 +88,7 @@ private async Task UpdateAppAsync(CancellationToken cancellationToken)
             if (!result.Successful)
             {
                 InfoBarViewModel.IsOpen = true;
-                InfoBarViewModel.Title = "Error";
+                InfoBarViewModel.Title = "Error".ToLocalized();
                 InfoBarViewModel.CanBeClosed = true;
                 InfoBarViewModel.Message = result.GetMessage();
                 InfoBarViewModel.InfoBarSeverity = InfoBarSeverityType.Error;

SecureFolderFS.Sdk/ViewModels/Views/Settings/GeneralSettingsViewModel.cs

@@ -1,21 +1,25 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls;
 using SecureFolderFS.Sdk.ViewModels.Controls.Banners;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Settings
 {
-    public sealed class GeneralSettingsViewModel : BasePageViewModel
+    public sealed partial class GeneralSettingsViewModel : BasePageViewModel
     {
         public ILocalizationService LocalizationService { get; } = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public UpdateBannerViewModel BannerViewModel { get; }
 
         public ObservableCollection<LanguageViewModel> Languages { get; }
 
+        [ObservableProperty] private LanguageViewModel? _SelectedLanguage;
+
         public GeneralSettingsViewModel()
         {
             BannerViewModel = new();
@@ -28,7 +32,17 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
             foreach (var item in LocalizationService.AppLanguages)
                 Languages.Add(new(item));
 
+            // Set selected language
+            SelectedLanguage = Languages.FirstOrDefault(x => x.CultureInfo.Equals(LocalizationService.CurrentCulture));
+
+            // Initialize the banner
             await BannerViewModel.InitAsync(cancellationToken);
         }
+
+        async partial void OnSelectedLanguageChanged(LanguageViewModel? value)
+        {
+            if (value is not null)
+                await LocalizationService.SetCultureAsync(value.CultureInfo);
+        }
     }
 }

SecureFolderFS.UI/ValueConverters/BaseBoolToStringConverter.cs

@@ -1,13 +1,10 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
-using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.Extensions;
 using System;
 
 namespace SecureFolderFS.UI.ValueConverters
 {
     public abstract class BaseBoolToStringConverter : BaseConverter
     {
-        private static ILocalizationService LocalizationService { get; } = Ioc.Default.GetRequiredService<ILocalizationService>();
-
         /// <inheritdoc/>
         protected override object? TryConvert(object? value, Type targetType, object? parameter)
         {
@@ -24,7 +21,7 @@ public abstract class BaseBoolToStringConverter : BaseConverter
             var valueSplit = formatString.Split(':');
             var splitOption = bValue ? valueSplit[3].Split('|') : valueSplit[1].Split('|');
 
-            return splitOption[0] == "LOCALIZE" ? LocalizationService.GetString(splitOption[1]) : splitOption[1];
+            return splitOption[0] == "LOCALIZE" ? splitOption[1].ToLocalized() : splitOption[1];
         }
 
         /// <inheritdoc/>

SecureFolderFS.UI/ValueConverters/BaseDateTimeToStringConverter.cs

@@ -1,4 +1,5 @@
-using System;
+using SecureFolderFS.Sdk.Extensions;
+using System;
 
 namespace SecureFolderFS.UI.ValueConverters
 {
@@ -20,7 +21,7 @@ public abstract class BaseDateTimeToStringConverter : BaseConverter
             {
                 var split = formatString.Split('|');
                 if (split[0] == "LOCALIZE")
-                    return string.Format(split[1], dateString); // TODO: Localize
+                    return string.Format(split[1].ToLocalized(), dateString); // TODO: Localize
                 else
                     return string.Format(split[1], dateString);
             }

SecureFolderFS.WinUI/Dialogs/SettingsDialog.xaml

@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:h="using:SecureFolderFS.WinUI.Helpers"
+    xmlns:l="using:SecureFolderFS.WinUI.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="using:SecureFolderFS.WinUI.UserControls.Navigation"
     Closing="SettingsDialog_Closing"
@@ -30,8 +31,8 @@
 
                 <!--  General  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="General"
-                    Content="General"
+                    AutomationProperties.Name="{l:ResourceString Name=SettingsGeneral}"
+                    Content="{l:ResourceString Name=SettingsGeneral}"
                     IsSelected="True"
                     Tag="0">
                     <NavigationViewItem.Icon>
@@ -41,8 +42,8 @@
 
                 <!--  Preferences  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="Preferences"
-                    Content="Preferences"
+                    AutomationProperties.Name="{l:ResourceString Name=SettingsPreferences}"
+                    Content="{l:ResourceString Name=SettingsPreferences}"
                     Tag="1">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE90F;" />
@@ -51,8 +52,8 @@
 
                 <!--  Privacy  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="Privacy"
-                    Content="Privacy"
+                    AutomationProperties.Name="{l:ResourceString Name=SettingsPrivacy}"
+                    Content="{l:ResourceString Name=SettingsPrivacy}"
                     Tag="2">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEA18;" />
@@ -62,7 +63,8 @@
                 <!--  About  -->
                 <NavigationViewItem
                     Margin="0,0,45,0"
-                    Content="About"
+                    AutomationProperties.Name="{l:ResourceString Name=SettingsAbout}"
+                    Content="{l:ResourceString Name=SettingsAbout}"
                     Tag="3">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE946;" />
@@ -90,5 +92,4 @@
             <FontIcon FontSize="10" Glyph="&#xE8BB;" />
         </Button>
     </Grid>
-
 </ContentDialog>