From 11c622afcac659e777e14ab293f5b95336f73b16 Mon Sep 17 00:00:00 2001 From: Seraphima Zykova Date: Fri, 5 Mar 2021 13:51:34 +0300 Subject: [PATCH] PowerToys Settings and OOBE title localization (#10054) --- .../Strings/en-us/Resources.resw | 6 ++++++ src/settings-ui/PowerToys.Settings/MainWindow.xaml | 1 - src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs | 4 ++++ src/settings-ui/PowerToys.Settings/OobeWindow.xaml | 1 - src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw index 1d4e580890..21b8c0d511 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw @@ -1145,4 +1145,10 @@ Win + Shift + O to toggle your video Welcome to PowerToys + + Welcome to PowerToys + + + PowerToys Settings + \ No newline at end of file diff --git a/src/settings-ui/PowerToys.Settings/MainWindow.xaml b/src/settings-ui/PowerToys.Settings/MainWindow.xaml index 6735a3e2d5..814dcda9c5 100644 --- a/src/settings-ui/PowerToys.Settings/MainWindow.xaml +++ b/src/settings-ui/PowerToys.Settings/MainWindow.xaml @@ -7,7 +7,6 @@ xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls" xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost" mc:Ignorable="d" - Title="PowerToys Settings" Height="860" MinHeight="400" Width="1180" diff --git a/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs b/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs index c8b253a837..f1ed6a9345 100644 --- a/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs +++ b/src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs @@ -9,6 +9,7 @@ using Microsoft.PowerToys.Settings.UI.Library.Utilities; using Microsoft.PowerToys.Settings.UI.Views; using Microsoft.PowerToys.Telemetry; using Microsoft.Toolkit.Wpf.UI.XamlHost; +using Windows.ApplicationModel.Resources; using Windows.Data.Json; namespace PowerToys.Settings @@ -29,6 +30,9 @@ namespace PowerToys.Settings Utils.FitToScreen(this); + ResourceLoader loader = ResourceLoader.GetForViewIndependentUse(); + Title = loader.GetString("SettingsWindow_Title"); + bootTime.Stop(); PowerToysTelemetry.Log.WriteEvent(new SettingsBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds }); diff --git a/src/settings-ui/PowerToys.Settings/OobeWindow.xaml b/src/settings-ui/PowerToys.Settings/OobeWindow.xaml index b4d87d43d2..bb8332631e 100644 --- a/src/settings-ui/PowerToys.Settings/OobeWindow.xaml +++ b/src/settings-ui/PowerToys.Settings/OobeWindow.xaml @@ -7,7 +7,6 @@ xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls" xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost" mc:Ignorable="d" - Title="Welcome to PowerToys" MinWidth="480" Height="700" Width="1100" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" diff --git a/src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs b/src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs index 7be7a88075..dc966a92a8 100644 --- a/src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs +++ b/src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs @@ -8,6 +8,7 @@ using interop; using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.OOBE.Views; using Microsoft.Toolkit.Wpf.UI.XamlHost; +using Windows.ApplicationModel.Resources; namespace PowerToys.Settings { @@ -31,6 +32,9 @@ namespace PowerToys.Settings { InitializeComponent(); Utils.FitToScreen(this); + + ResourceLoader loader = ResourceLoader.GetForViewIndependentUse(); + Title = loader.GetString("OobeWindow_Title"); } private void Window_Closed(object sender, EventArgs e)