Fix incorrect culture after reboot

reagcz · Oct 14, 2024 · fc65b40 · fc65b40
1 parent 4a4650a
commit fc65b40
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 5 deletions.
diff --git a/IdeapadToolkit/App.xaml.cs b/IdeapadToolkit/App.xaml.cs
@@ -11,6 +11,7 @@
 using Serilog.Core;
 using System.Globalization;
 using System.Threading;
+using IdeapadToolkit.Localization;
 
 namespace IdeapadToolkit
 {
@@ -57,9 +58,10 @@ protected override void OnStartup(StartupEventArgs e)
             ConfigureServices(container);
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             bool exists = Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Environment.ProcessPath)).Length > 1;
+            TrySetCulture();
             if (exists && !e.Args.Contains("ignoreRunning"))
             {
-                MessageBox.Show("Already running!", "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
+                MessageBox.Show(Strings.ALREADY_RUNNING, "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
                 Application.Current.Shutdown();
                 return;
             }
@@ -70,7 +72,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             if (!File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PowerBattery.dll")))
             {
-                MessageBox.Show("PowerBattery.dll has to be present in the same folder as IdeapadToolkit.exe", "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
+                MessageBox.Show(Strings.DLL_MISSING_ERROR, "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
                 Application.Current.Shutdown();
             }
             if (!e.Args.Contains("nogui"))
@@ -91,6 +93,16 @@ private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionE
         public void ShowMainWindow(object? sender, EventArgs? e)
         {
             if (App.Current.MainWindow == null)
+            {
+                TrySetCulture();
+                App.Current.MainWindow = _container.GetInstance<MainWindow>();
+            }
+            App.Current.MainWindow.Show();
+        }
+
+        private void TrySetCulture()
+        {
+            try
             {
                 var culture = Settings.Default.Language;
                 if (!String.IsNullOrWhiteSpace(culture))
@@ -104,10 +116,10 @@ public void ShowMainWindow(object? sender, EventArgs? e)
                         });
                     }
                 }
-
-                App.Current.MainWindow = _container.GetInstance<MainWindow>();
             }
-            App.Current.MainWindow.Show();
+            catch (Exception ex)
+            {
+            }
         }
 
         private void MenuItemExit_Click(object sender, RoutedEventArgs e)

diff --git a/IdeapadToolkit/Localization/Strings.Designer.cs b/IdeapadToolkit/Localization/Strings.Designer.cs
diff --git a/IdeapadToolkit/Localization/Strings.cs-CZ.resx b/IdeapadToolkit/Localization/Strings.cs-CZ.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ALREADY_RUNNING" xml:space="preserve">
+    <value>Aplikace je již spuštěná</value>
+  </data>
   <data name="ALWAYS_ON_USB" xml:space="preserve">
     <value>USB vždy zapnuté</value>
   </data>
@@ -132,6 +135,9 @@
   <data name="CONSERVATION" xml:space="preserve">
     <value>Šetrný</value>
   </data>
+  <data name="DLL_MISSING_ERROR" xml:space="preserve">
+    <value>Soubor PowerBattery.dll musí být přítomen ve stejné složce jako IdeapadToolkit.exe</value>
+  </data>
   <data name="EXTREME_PERFORMANCE" xml:space="preserve">
     <value>Extrémní výkon</value>
   </data>

diff --git a/IdeapadToolkit/Localization/Strings.fr-FR.resx b/IdeapadToolkit/Localization/Strings.fr-FR.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ALREADY_RUNNING" xml:space="preserve">
+    <value>L'application est déjà en cours d'exécution</value>
+  </data>
   <data name="ALWAYS_ON_USB" xml:space="preserve">
     <value>USB toujours activé</value>
   </data>
@@ -132,6 +135,9 @@
   <data name="CONSERVATION" xml:space="preserve">
     <value>Conservation</value>
   </data>
+  <data name="DLL_MISSING_ERROR" xml:space="preserve">
+    <value>PowerBattery.dll doit être présent dans le même dossier que IdeapadToolkit.exe</value>
+  </data>
   <data name="EXTREME_PERFORMANCE" xml:space="preserve">
     <value>Performances maximales</value>
   </data>

diff --git a/IdeapadToolkit/Localization/Strings.resx b/IdeapadToolkit/Localization/Strings.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ALREADY_RUNNING" xml:space="preserve">
+    <value>The app is already running</value>
+  </data>
   <data name="ALWAYS_ON_USB" xml:space="preserve">
     <value>Always on USB</value>
   </data>
@@ -132,6 +135,9 @@
   <data name="CONSERVATION" xml:space="preserve">
     <value>Conservation</value>
   </data>
+  <data name="DLL_MISSING_ERROR" xml:space="preserve">
+    <value>PowerBattery.dll has to be present in the same folder as IdeapadToolkit.exe</value>
+  </data>
   <data name="EXTREME_PERFORMANCE" xml:space="preserve">
     <value>Extreme Performance</value>
   </data>