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 @@
PreserveNewest
+ Always
PreserveNewest
+ Always
PreserveNewest
+ Always
@@ -118,4 +121,4 @@
-
\ No newline at end of file
+
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 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;
}