Merge pull request #276 from Q-Sharp/main

add en to lang selection
Razzmatazzz · Sep 24, 2024 · 21f0562 · 21f0562
2 parents 63c5d1a + eb397df
commit 21f0562
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -41,7 +41,7 @@ jobs:
         proj-path: ${{ env.Project }}
 
     - name: publish
-      run: dotnet publish -o "./publish"
+      run: dotnet publish RemnantSaveGuardian/RemnantSaveGuardian.csproj -o "./publish"
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4

diff --git a/RemnantSaveGuardian/App.xaml.cs b/RemnantSaveGuardian/App.xaml.cs
@@ -110,9 +110,12 @@ private CultureInfo[] EnumerateSupportedCultures()
         {
             CultureInfo[] culture = CultureInfo.GetCultures(CultureTypes.AllCultures);
 
-            string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+            string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)) ?? "";
+
+            var c = culture.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, cultureInfo.Name)) && cultureInfo.Name != "")
+                .Prepend(CultureInfo.GetCultureInfo("en"))
+                .ToArray();
 
-            var c = culture.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, cultureInfo.Name)) && cultureInfo.Name != "").ToArray();
             return c;
         }
 

diff --git a/RemnantSaveGuardian/RemnantSaveGuardian.csproj b/RemnantSaveGuardian/RemnantSaveGuardian.csproj
@@ -8,7 +8,7 @@
     <SatelliteResourceLanguages>en;ru;de;es;fr;it;ja;ko;pt-BR;zh-Hans;zh-Hant</SatelliteResourceLanguages>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>Assets\256.ico</ApplicationIcon>
-    <AssemblyVersion>1.3.1.0</AssemblyVersion>
+    <AssemblyVersion>1.3.2.0</AssemblyVersion>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>