Fix #60: Hardcoded download status strings

Gymnasiast · Gymnasiast · commit 9d9def35b56a · 2025-11-08T15:07:11.000+01:00
diff --git a/src/IntelOrca.OpenLauncher.Core/DownloadService.cs b/src/IntelOrca.OpenLauncher.Core/DownloadService.cs
@@ -8,7 +8,7 @@ namespace IntelOrca.OpenLauncher.Core
 {
     public class DownloadService
     {
-        private const string StatusDownloading = "Downloading";
+        private const string StatusDownloading = "StatusDownloading";
 
         public async Task<string> DownloadFileAsync(Uri uri, IProgress<DownloadProgressReport> progress, CancellationToken ct)
         {
diff --git a/src/IntelOrca.OpenLauncher.Core/InstallService.cs b/src/IntelOrca.OpenLauncher.Core/InstallService.cs
@@ -111,7 +111,7 @@ public async Task DownloadVersion(
             IProgress<DownloadProgressReport> progress,
             CancellationToken ct)
         {
-            const string StatusExtracting = "Extracting";
+            const string StatusExtracting = "StatusExtracting";
 
             var tempFile = await downloadService.DownloadFileAsync(uri, progress, ct).ConfigureAwait(false);
             try
diff --git a/src/openlauncher/MainWindow.axaml.cs b/src/openlauncher/MainWindow.axaml.cs
@@ -177,7 +177,7 @@ private async void InstallLatestBuildFromVersionDropdown()
                     {
                         Dispatcher.UIThread.Post(() =>
                         {
-                            downloadButton.Content = report.Status;
+                            downloadButton.Content = StringResources.GetString(report.Status);
                             if (report.Value is float value)
                             {
                                 downloadProgress.IsIndeterminate = false;
diff --git a/src/openlauncher/Properties/Resources.Designer.cs b/src/openlauncher/Properties/Resources.Designer.cs
diff --git a/src/openlauncher/Properties/Resources.nl.resx b/src/openlauncher/Properties/Resources.nl.resx
@@ -72,4 +72,10 @@
   <data name="BuildListing" xml:space="preserve">
     <value>{0} ({1} vrijgegeven)</value>
   </data>
+  <data name="StatusDownloading" xml:space="preserve">
+    <value>Downloaden…</value>
+  </data>
+  <data name="StatusExtracting" xml:space="preserve">
+    <value>Uitpakken…</value>
+  </data>
 </root>
diff --git a/src/openlauncher/Properties/Resources.resx b/src/openlauncher/Properties/Resources.resx
@@ -72,4 +72,10 @@
   <data name="BuildListing" xml:space="preserve">
     <value>{0} (released {1})</value>
   </data>
+  <data name="StatusDownloading" xml:space="preserve">
+    <value>Downloading…</value>
+  </data>
+  <data name="StatusExtracting" xml:space="preserve">
+    <value>Extracting…</value>
+  </data> 
 </root>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace IntelOrca.OpenLauncher.Core`
`8`	`8`	`{`
`9`	`9`	`public class DownloadService`
`10`	`10`	`{`
`11`		`- private const string StatusDownloading = "Downloading";`
	`11`	`+ private const string StatusDownloading = "StatusDownloading";`
`12`	`12`
`13`	`13`	`public async Task<string> DownloadFileAsync(Uri uri, IProgress<DownloadProgressReport> progress, CancellationToken ct)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public async Task DownloadVersion(`
`111`	`111`	`IProgress<DownloadProgressReport> progress,`
`112`	`112`	`CancellationToken ct)`
`113`	`113`	`{`
`114`		`- const string StatusExtracting = "Extracting";`
	`114`	`+ const string StatusExtracting = "StatusExtracting";`
`115`	`115`
`116`	`116`	`var tempFile = await downloadService.DownloadFileAsync(uri, progress, ct).ConfigureAwait(false);`
`117`	`117`	`try`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private async void InstallLatestBuildFromVersionDropdown()`
`177`	`177`	`{`
`178`	`178`	`Dispatcher.UIThread.Post(() =>`
`179`	`179`	`{`
`180`		`- downloadButton.Content = report.Status;`
	`180`	`+ downloadButton.Content = StringResources.GetString(report.Status);`
`181`	`181`	`if (report.Value is float value)`
`182`	`182`	`{`
`183`	`183`	`downloadProgress.IsIndeterminate = false;`