From de539b6ad6af6985bee87df0133b41992b56c78c Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Wed, 19 Jun 2024 21:17:23 +0100
Subject: [PATCH] Fix i18n issues in error logging

---
 Bloxstrap/App.xaml.cs | 7 ++++++-
 Bloxstrap/Logger.cs   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
index 5460f58..bdda0c7 100644
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@@ -29,6 +29,8 @@ namespace Bloxstrap
 
         public static LaunchSettings LaunchSettings { get; private set; } = null!;
 
+        public static CultureInfo CurrentCulture { get; private set; } = CultureInfo.InvariantCulture;
+
         public static BuildMetadataAttribute BuildMetadata = Assembly.GetExecutingAssembly().GetCustomAttribute<BuildMetadataAttribute>()!;
         public static string Version = Assembly.GetExecutingAssembly().GetName().Version!.ToString()[..^2];
 
@@ -110,7 +112,10 @@ namespace Bloxstrap
         protected override async void OnStartup(StartupEventArgs e)
         {
             const string LOG_IDENT = "App::OnStartup";
-            
+
+            CultureInfo.DefaultThreadCurrentUICulture = CurrentCulture;
+            Thread.CurrentThread.CurrentUICulture = CurrentCulture;
+
             base.OnStartup(e);
 
             Logger.WriteLine(LOG_IDENT, $"Starting {ProjectName} v{Version}");
diff --git a/Bloxstrap/Logger.cs b/Bloxstrap/Logger.cs
index e193c32..093591e 100644
--- a/Bloxstrap/Logger.cs
+++ b/Bloxstrap/Logger.cs
@@ -93,10 +93,11 @@
 
         public void WriteException(string identifier, Exception ex)
         {
-            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             WriteLine($"[{identifier}] {ex}");
+
+            Thread.CurrentThread.CurrentUICulture = App.CurrentCulture;
         }
 
         private async void WriteToLog(string message)