From 6b71d250a01014509616733eeeb4e9ef615d8088 Mon Sep 17 00:00:00 2001
From: Pear-231 <61670316+Pear-231@users.noreply.github.com>
Date: Mon, 27 Jul 2026 14:28:33 +0100
Subject: [PATCH] Fixed missing loc bug by looking up using app directory

---
 AssetEditor/App.xaml.cs                                    | 2 +-
 AssetEditor/AssetEditor.csproj                             | 5 ++++-
 .../SharedCore/Shared.Core/Services/LocalizationManager.cs | 7 +++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/AssetEditor/App.xaml.cs b/AssetEditor/App.xaml.cs
index d2a6ae3ac..e3970c869 100644
--- a/AssetEditor/App.xaml.cs
+++ b/AssetEditor/App.xaml.cs
@@ -62,7 +62,7 @@ protected override void OnStartup(StartupEventArgs e)
             if (settingsService.CurrentSettings.IsFirstTimeStartingApplication)
             {
                 var detectedLang = DetectSystemLanguage();
-                if (File.Exists($"Language_{detectedLang}.json"))
+                if (File.Exists(Path.Combine(AppContext.BaseDirectory, $"Language_{detectedLang}.json")))
                     settingsService.CurrentSettings.SelectedLangauge = detectedLang;
                 settingsService.Save();
             }
diff --git a/AssetEditor/AssetEditor.csproj b/AssetEditor/AssetEditor.csproj
index e82ab9678..4bba02b08 100644
--- a/AssetEditor/AssetEditor.csproj
+++ b/AssetEditor/AssetEditor.csproj
@@ -84,12 +84,15 @@
     <ItemGroup>
       <None Update="Language_Cn.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
       </None>
       <None Update="Language_Fr.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
       </None>
       <None Update="Language_En.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
       </None>
     </ItemGroup>
 
@@ -118,4 +121,4 @@
 
         <MSBuild Projects="$(UpdaterProject)" Targets="Restore;Publish" Properties="PublishDir=$(AbsolutePublishDir);Configuration=$(Configuration);RuntimeIdentifier=$(RuntimeIdentifier);SelfContained=$(SelfContained);PublishSingleFile=$(PublishSingleFile);PublishReadyToRun=$(PublishReadyToRun)" />
     </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Shared/SharedCore/Shared.Core/Services/LocalizationManager.cs b/Shared/SharedCore/Shared.Core/Services/LocalizationManager.cs
index d1e83bf84..b5bee9dfa 100644
--- a/Shared/SharedCore/Shared.Core/Services/LocalizationManager.cs
+++ b/Shared/SharedCore/Shared.Core/Services/LocalizationManager.cs
@@ -14,8 +14,7 @@ public class LocalizationManager
 
         public List<string> GetPossibleLanguages()
         {
-            var currentDirectory = Directory.GetCurrentDirectory();
-            var langaugeFiles = Directory.GetFiles(currentDirectory, "Language_*.json")
+            var langaugeFiles = Directory.GetFiles(AppContext.BaseDirectory, "Language_*.json")
                 .Select(Path.GetFileNameWithoutExtension)
                 .Select(name => name!.Substring("Language_".Length).ToLower())
                 .ToList();
@@ -28,11 +27,11 @@ public void LoadLanguage(string languageCode)
         {
             _selectedLangauge = languageCode.ToLower();
 
-            var languageFile= $"Language_{_selectedLangauge}.json";
+            var languageFile = Path.Combine(AppContext.BaseDirectory, $"Language_{_selectedLangauge}.json");
             if (File.Exists(languageFile) == false)
             {
                 MessageBox.Show($"Language file for code '{_selectedLangauge}' not found.");
-                _logger.Here().Error($"Language file for code '{_selectedLangauge}' not found. in {Directory.GetCurrentDirectory()}");
+                _logger.Here().Error($"Language file for code '{_selectedLangauge}' not found in {AppContext.BaseDirectory}");
                 return;
             }