Skip to content

Portable Tool for an Ideal Windows Setup

-changing the interface language

Greedeksbe91d7395684
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 246eecb6..db9f1f9f 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -1,5 +1,6 @@
using Microsoft.Win32;
using System;
+using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
@@ -16,25 +17,23 @@ namespace GTweak
InitializeComponent();
}
- internal static CultureInfo Language
+ internal static string Language
{
- get => System.Threading.Thread.CurrentThread.CurrentUICulture;
set
{
- if (value == null) throw new ArgumentNullException(nameof(value));
+ value ??= Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline).ToString();
- ResourceDictionary dictionary = new ResourceDictionary();
-
- string getSystemLanguage = Regex.Replace(value.Name, @"-.+$", "",RegexOptions.Multiline);
-
- dictionary.Source = getSystemLanguage switch
+ ResourceDictionary dictionary = new ResourceDictionary
{
- "ru" => new Uri($"Language/lang.ru.xaml", UriKind.Relative),
- _ => new Uri("Language/lang.xaml", UriKind.Relative),
+ Source = value switch
+ {
+ "ru" => new Uri($"Language/lang.ru.xaml", UriKind.Relative),
+ _ => new Uri("Language/lang.xaml", UriKind.Relative),
+ }
};
- ResourceDictionary oldDictionary = (from d in Current.Resources.MergedDictionaries
- where d.Source != null && d.Source.OriginalString.StartsWith("Language/lang.") select d).First();
+ ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
+ where dict.Source != null && dict.Source.OriginalString.StartsWith("Language/lang.") select dict).First();
if (oldDictionary != null)
{
int ind = Current.Resources.MergedDictionaries.IndexOf(oldDictionary);
@@ -49,7 +48,8 @@ namespace GTweak
internal static void UpdateImport()=> ImportTweaksUpdate?.Invoke(null, EventArgs.Empty);
- internal static void ViewLang() => Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() == "en" ? CultureInfo.GetCultureInfo("en-US") : CultureInfo.GetCultureInfo("ru-RU");
+ internal static void ViewLang() => Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() ?? Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline).ToString();
+
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 83e95d6c..307778a2 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -3,7 +3,6 @@ using GTweak.Utilities.Tweaks;
using System;
using System.ComponentModel;
using System.Diagnostics;
-using System.Globalization;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@@ -143,16 +142,17 @@ namespace GTweak
private void LanguageSelectionMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
- if (LanguageSelectionMenu.SelectedIndex == 0)
+ switch (LanguageSelectionMenu.SelectedIndex)
{
- Settings.ChangingParameters("en", "Language");
- App.Language = CultureInfo.GetCultureInfo("en-US");
+ case 0:
+ Settings.ChangingParameters("en", "Language");
+ App.Language = "en";
+ break;
+ default:
+ Settings.ChangingParameters("ru", "Language");
+ App.Language = "ru";
+ break;
}
- else
- {
- Settings.ChangingParameters("ru", "Language");
- App.Language = CultureInfo.GetCultureInfo("ru-RU");
- }
}
private void BtnExport_PreviewMouseDown(object sender, MouseButtonEventArgs e)