Skip to content

Commit

Permalink
PowerToys Settings and OOBE title localization (#10054)
Browse files Browse the repository at this point in the history
  • Loading branch information
SeraphimaZykova committed Mar 5, 2021
1 parent 22429b2 commit 11c622a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1145,4 +1145,10 @@ Win + Shift + O to toggle your video</value>
<data name="Oobe_Button.Text" xml:space="preserve">
<value>Welcome to PowerToys</value>
</data>
<data name="OobeWindow_Title" xml:space="preserve">
<value>Welcome to PowerToys</value>
</data>
<data name="SettingsWindow_Title" xml:space="preserve">
<value>PowerToys Settings</value>
</data>
</root>
1 change: 0 additions & 1 deletion src/settings-ui/PowerToys.Settings/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
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
Expand All @@ -29,6 +30,9 @@ public MainWindow()

Utils.FitToScreen(this);

ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
Title = loader.GetString("SettingsWindow_Title");

bootTime.Stop();

PowerToysTelemetry.Log.WriteEvent(new SettingsBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
Expand Down
1 change: 0 additions & 1 deletion src/settings-ui/PowerToys.Settings/OobeWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions src/settings-ui/PowerToys.Settings/OobeWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
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
{
Expand All @@ -31,6 +32,9 @@ public OobeWindow()
{
InitializeComponent();
Utils.FitToScreen(this);

ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
Title = loader.GetString("OobeWindow_Title");
}

private void Window_Closed(object sender, EventArgs e)
Expand Down

0 comments on commit 11c622a

Please sign in to comment.