localization

ElectronicObserverEN · Nov 24, 2024 · 2e5fb1d · 2e5fb1d
1 parent 80bc5e1
commit 2e5fb1d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/ElectronicObserver/Data/Bonodere/BonodereHttpClient.cs b/ElectronicObserver/Data/Bonodere/BonodereHttpClient.cs
@@ -11,12 +11,14 @@
 
 namespace ElectronicObserver.Data.Bonodere;
 
-public class BonodereHttpClient
+public class BonodereHttpClient(BonodereSubmissionTranslationViewModel translations)
 {
 	private HttpClient? CurrentClient { get; set; }
 
 	public bool IsReady => CurrentClient is not null;
 
+	private BonodereSubmissionTranslationViewModel Translations { get; } = translations;
+
 	private static HttpClient MakeHttpClient() => new()
 	{
 		BaseAddress = new("https://bonodere.famluro.es/api/"),
@@ -119,7 +121,7 @@ public async Task SubmitData(List<SenkaEntryModel> data)
 		}
 		else
 		{
-			Logger.Add(2, "Bonodere submission : Success");
+			Logger.Add(2, Translations.Success);
 		}
 	}
 
@@ -131,8 +133,8 @@ private async Task HandleErrorResponse(HttpResponseMessage response)
 		{
 			Logger.Add(2, errorData switch
 			{
-				{ Code: >0 } => $"Bonodere error : {errorData.Message} ({errorData.Code})",
-				 _ => $"Bonodere error : {errorData.Message}",
+				{ Code: >0 } => $"{BonodereSubmissionResources.BonodereError} : {errorData.Message} ({errorData.Code})",
+				 _ => $"{BonodereSubmissionResources.BonodereError} {errorData.Message}",
 			});
 		}
 		else

diff --git a/ElectronicObserver/Data/Bonodere/BonodereSubmissionResources.en.resx b/ElectronicObserver/Data/Bonodere/BonodereSubmissionResources.en.resx
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="BonodereError" xml:space="preserve">
+    <value>Bonodere error</value>
+  </data>
+  <data name="BonodereSubmissionSuccess" xml:space="preserve">
+    <value>Bonodere submission : Success</value>
+  </data>
   <data name="InconsistantDataDetected" xml:space="preserve">
     <value>Inconsistant data detected</value>
   </data>

diff --git a/ElectronicObserver/Data/Bonodere/BonodereSubmissionResources.resx b/ElectronicObserver/Data/Bonodere/BonodereSubmissionResources.resx
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="BonodereError" xml:space="preserve">
+    <value>Bonodere エラー</value>
+  </data>
+  <data name="BonodereSubmissionSuccess" xml:space="preserve">
+    <value>??? (Bonodere submission : Success)</value>
+  </data>
   <data name="InconsistantDataDetected" xml:space="preserve">
     <value>??? (Inconsistant data detected)</value>
   </data>

diff --git a/ElectronicObserver/Data/Bonodere/BonodereSubmissionService.cs b/ElectronicObserver/Data/Bonodere/BonodereSubmissionService.cs
@@ -12,13 +12,14 @@ public class BonodereSubmissionService
 {
 	private BonodereSubmissionTranslationViewModel BonodereSubmission { get; }
 
-	private BonodereHttpClient BonodereClient { get; } = new();
+	private BonodereHttpClient BonodereClient { get; }
 
 	public string Username { get; set; } = "";
 
 	public BonodereSubmissionService(BonodereSubmissionTranslationViewModel translations)
 	{
 		BonodereSubmission = translations;
+		BonodereClient = new(BonodereSubmission);
 
 		_ = LoginFromSavedToken();
 
@@ -71,7 +72,7 @@ public async Task SubmitData(List<SenkaEntryModel> data)
 
 		if (!IsDataValid(data))
 		{
-			Logger.Add(2, $"Bonodere error: {BonodereSubmission.InconsistantDataDetected}");
+			Logger.Add(2, $"{BonodereSubmission.Error}: {BonodereSubmission.InconsistantDataDetected}");
 			return;
 		}
 
@@ -95,8 +96,8 @@ private bool IsDataValid(List<SenkaEntryModel> data)
 		return true;
 	}
 
-	private static void LogError(Exception e)
+	private void LogError(Exception e)
 	{
-		Logger.Add(2, "Bonodere error", e);
+		Logger.Add(2, BonodereSubmission.Error, e);
 	}
 }
diff --git a/ElectronicObserver/Data/Bonodere/BonodereSubmissionTranslationViewModel.cs b/ElectronicObserver/Data/Bonodere/BonodereSubmissionTranslationViewModel.cs
@@ -5,4 +5,6 @@ namespace ElectronicObserver.Data.Bonodere;
 public class BonodereSubmissionTranslationViewModel : TranslationBaseViewModel
 {
 	public string InconsistantDataDetected => BonodereSubmissionResources.InconsistantDataDetected;
+	public string Error => BonodereSubmissionResources.BonodereError;
+	public string Success => BonodereSubmissionResources.BonodereSubmissionSuccess;
 }
diff --git a/ElectronicObserver/Window/Settings/DataSubmission/ConfigurationDataSubmissionViewModel.cs b/ElectronicObserver/Window/Settings/DataSubmission/ConfigurationDataSubmissionViewModel.cs
@@ -92,7 +92,7 @@ private async Task BonodereLogin(SecureString password)
 		{
 			LoginError = ex.Message;
 
-			Logger.Add(2, "Bonodere error", ex);
+			Logger.Add(2, BonodereSubmissionResources.BonodereError, ex);
 		}
 	}
 

diff --git a/ElectronicObserver/Window/Wpf/SenkaLeaderboard/SenkaLeaderboardManager.cs b/ElectronicObserver/Window/Wpf/SenkaLeaderboard/SenkaLeaderboardManager.cs
@@ -70,7 +70,7 @@ private void HandleData(string apiname, dynamic data)
 		}
 		catch (Exception ex)
 		{
-			Logger.Add(2, "Bonodere error", ex);
+			Logger.Add(2, BonodereSubmissionResources.BonodereError, ex);
 		}
 		finally
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ private async Task BonodereLogin(SecureString password) @@
     		{
     			LoginError = ex.Message;
-    			Logger.Add(2, "Bonodere error", ex);
+    			Logger.Add(2, BonodereSubmissionResources.BonodereError, ex);
     		}
     	}
@@ Expand Down @@