Task/translations again

WheelWizard.Test/Features/GameBananaTests.cs

@@ -89,7 +89,7 @@ public async Task GetModSearchResults_WithApiError_ReturnsFailure()
 
             _apiCaller
                 .CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaSearchResults>>>>())
-                .Returns(Fail<GameBananaSearchResults>(expectedError));
+                .Returns(Fail(expectedError));
 
             // Act
             var result = await _service.GetModSearchResults(searchTerm, page);
@@ -128,9 +128,7 @@ public async Task GetModDetails_WithApiError_ReturnsFailure()
             var modId = 123;
             var expectedError = "API Error";
 
-            _apiCaller
-                .CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaModDetails>>>>())
-                .Returns(Fail<GameBananaModDetails>(expectedError));
+            _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaModDetails>>>>()).Returns(Fail(expectedError));
 
             // Act
             var result = await _service.GetModDetails(modId);

WheelWizard.Test/Features/MiiDbServiceTests.cs

@@ -1,7 +1,6 @@
 using NSubstitute.ExceptionExtensions;
 using Testably.Abstractions;
 using WheelWizard.Shared;
-using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
@@ -58,9 +57,7 @@ private OperationResult<Mii> CreateValidMii(uint id = 1, string name = "TestMii"
                 creatorName,
             };
             if (EveryResult.Any(r => r.IsFailure))
-            {
-                return Fail<Mii>(EveryResult.First(r => r.IsFailure).Error);
-            }
+                return EveryResult.First(r => r.IsFailure).Error!;
 
             return Ok(
                 new Mii
@@ -348,7 +345,7 @@ public void Update_ShouldReturnFailure_WhenRepositoryUpdateFails()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(repoError.Error, result.Error); // Propagate the exact error
+            Assert.Equal(repoError, result.Error); // Propagate the exact error
             _repositoryService.Received(1).UpdateBlockByClientId(miiToUpdate.MiiId, Arg.Is<byte[]>(b => b.SequenceEqual(expectedBytes)));
         }
 
@@ -426,7 +423,7 @@ public void UpdateName_ShouldReturnFailure_WhenGetByClientIdFails_NotFound()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal("Mii block not found or invalid.", result.Error.Message); // Error from GetByClientId
+            Assert.Equal("Mii block not found", result.Error.Message); // Error from GetByClientId
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
             _repositoryService.DidNotReceive().UpdateBlockByClientId(Arg.Any<uint>(), Arg.Any<byte[]>());
         }
@@ -494,7 +491,7 @@ public void UpdateName_ShouldReturnFailure_WhenRepositoryUpdateFails()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(repoError.Error, result.Error); // Error from the repository update propagated
+            Assert.Equal(repoError, result.Error); // Error from the repository update propagated
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
             _repositoryService.Received(1).UpdateBlockByClientId(targetId, Arg.Any<byte[]>());
         }

WheelWizard.Test/Features/WhWzDataTests.cs

@@ -41,7 +41,7 @@ public async Task GetStatusAsync_ReturnsFailure_WhenApiCallFails()
         // Arrange
         var expectedError = new OperationError { Message = "API call failed" };
 
-        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<WhWzStatus>>>>()).Returns(Fail<WhWzStatus>(expectedError));
+        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<WhWzStatus>>>>()).Returns(expectedError);
 
         // Act
         var result = await _service.GetStatusAsync();
@@ -77,9 +77,7 @@ public async Task LoadBadgesAsync_ReturnsFailure_WhenApiCallFails()
         // Arrange
         var expectedError = new OperationError { Message = "API call failed" };
 
-        _apiCaller
-            .CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>())
-            .Returns(Fail<Dictionary<string, BadgeVariant[]>>(expectedError));
+        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>()).Returns(expectedError);
 
         // Act
         var result = await _service.LoadBadgesAsync();

WheelWizard.Test/GlobalUsings.cs

@@ -1,2 +1,3 @@
 global using NSubstitute;
+global using static WheelWizard.Shared.OperationError;
 global using static WheelWizard.Shared.OperationResult;

WheelWizard.Test/Shared/OperationResult/OperationResultTests.cs

@@ -1,4 +1,6 @@
-using WheelWizard.Shared;
+using WheelWizard.Helpers;
+using WheelWizard.Shared;
+using WheelWizard.Shared.MessageTranslations;
 
 namespace WheelWizard.Test.Shared.OperationResultTests;
 
@@ -52,12 +54,29 @@ public void CreateFailureResult_ShouldHaveCorrectState()
         var error = new OperationError { Message = "Error message" };
 
         // Act
-        var operationResult = Fail(error);
+        OperationResult operationResult = error;
 
         // Assert
         Assert.Equal(error, operationResult.Error);
         Assert.True(operationResult.IsFailure);
         Assert.False(operationResult.IsSuccess);
+        Assert.Null(operationResult.Error!.MessageTranslation);
+    }
+
+    [Fact(DisplayName = "Create failure result, should have correct state with translation")]
+    public void CreateFailureResult_ShouldHaveCorrectStateWithTranslation()
+    {
+        const string errorMessage = "Error message";
+        const MessageTranslation errorTranslation = MessageTranslation.Error_StanderdError;
+
+        // Act
+        OperationResult operationResult = Fail(errorMessage, errorTranslation);
+
+        // Assert
+        Assert.True(operationResult.IsFailure);
+        Assert.False(operationResult.IsSuccess);
+        Assert.Equal(errorMessage, operationResult.Error.Message);
+        Assert.Equal(errorTranslation, operationResult.Error.MessageTranslation);
     }
 
     [Fact(DisplayName = "Implicit result from error, should have correct state")]
@@ -129,7 +148,7 @@ public void CreateFailureGenericResult_ShouldHaveCorrectState()
         var error = new OperationError { Message = "Error message" };
 
         // Act
-        var operationResult = Fail(error);
+        OperationResult operationResult = error;
 
         // Assert
         Assert.Equal(error, operationResult.Error);
@@ -150,6 +169,7 @@ public void ImplicitGenericResultFromError_ShouldHaveCorrectState()
         Assert.Equal(error, operationResult.Error);
         Assert.True(operationResult.IsFailure);
         Assert.False(operationResult.IsSuccess);
+        Assert.Null(operationResult.Error!.MessageTranslation);
     }
 
     [Fact(DisplayName = "Implicit generic result from value, should have correct state")]
@@ -168,22 +188,6 @@ public void ImplicitGenericResultFromValue_ShouldHaveCorrectState()
         Assert.Equal(value, operationResult.Value);
     }
 
-    [Fact(DisplayName = "Implicit result from string, should have failed state")]
-    public void ImplicitResultFromString_ShouldHaveFailedState()
-    {
-        // Arrange
-        const string errorMessage = "Error message";
-
-        // Act
-        OperationResult operationResult = errorMessage;
-
-        // Assert
-        Assert.NotNull(operationResult.Error);
-        Assert.True(operationResult.IsFailure);
-        Assert.False(operationResult.IsSuccess);
-        Assert.Equal(errorMessage, operationResult.Error?.Message);
-    }
-
     [Fact(DisplayName = "Implicit result from exception, should have failed state")]
     public void ImplicitResultFromException_ShouldHaveFailedState()
     {
@@ -198,22 +202,7 @@ public void ImplicitResultFromException_ShouldHaveFailedState()
         Assert.True(operationResult.IsFailure);
         Assert.False(operationResult.IsSuccess);
         Assert.Equal(exception.Message, operationResult.Error?.Message);
-    }
-
-    [Fact(DisplayName = "Implicit generic result from string, should have correct failed state")]
-    public void ImplicitGenericResultFromString_ShouldHaveCorrectFailedState()
-    {
-        // Arrange
-        const string errorMessage = "Error message";
-
-        // Act
-        OperationResult<object> operationResult = errorMessage;
-
-        // Assert
-        Assert.NotNull(operationResult.Error);
-        Assert.True(operationResult.IsFailure);
-        Assert.False(operationResult.IsSuccess);
-        Assert.Equal(errorMessage, operationResult.Error?.Message);
+        Assert.Null(operationResult.Error!.MessageTranslation);
     }
 
     [Fact(DisplayName = "Implicit generic result from exception, should have correct failed state")]
@@ -278,6 +267,27 @@ public void TryCatchWithExceptionWithOverride_ShouldHaveFailedStateWithMessage()
         Assert.True(result.IsFailure);
         Assert.Equal(errorMessage, result.Error?.Message);
         Assert.Equal(exception, result.Error?.Exception);
+        Assert.Null(result.Error?.MessageTranslation);
+    }
+
+    [Fact(DisplayName = "Try catch with exception with override, should have failed state with message and translation")]
+    public void TryCatchWithExceptionWithOverride_ShouldHaveFailedStateWithMessageAndTranslation()
+    {
+        // Arrange
+        var exception = new Exception("Error message");
+        const string errorMessage = "Custom error message";
+        const MessageTranslation errorTranslation = MessageTranslation.Error_StanderdError;
+
+        // Act
+        void Action() => throw exception;
+
+        var result = TryCatch(Action, errorMessage, errorTranslation);
+
+        // Assert
+        Assert.True(result.IsFailure);
+        Assert.Equal(errorMessage, result.Error?.Message);
+        Assert.Equal(exception, result.Error?.Exception);
+        Assert.Equal(errorTranslation, result.Error?.MessageTranslation);
     }
 
     [Fact(DisplayName = "Generic try catch without exception, should have correct success state")]

WheelWizard/Features/AutoUpdating/AutoUpdaterSingletonService.cs

@@ -35,14 +35,14 @@ public async Task CheckForUpdatesAsync()
             return;
 
         var latestVersion = SemVersion.Parse(latestRelease.TagName.TrimStart('v'), SemVersionStyles.Any);
-        var popupExtraText = Humanizer.ReplaceDynamic(Phrases.PopupText_NewVersionWhWz, latestVersion, CurrentVersion)!;
+        var popupExtraText = Humanizer.ReplaceDynamic(Phrases.Question_NewVersionWhWz_Extra, latestVersion, CurrentVersion)!;
 
         var shouldUpdate = false;
         await Dispatcher.UIThread.InvokeAsync(async () =>
         {
             shouldUpdate = await new YesNoWindow()
                 .SetButtonText(Common.Action_Update, Common.Action_MaybeLater)
-                .SetMainText(Phrases.PopupText_WhWzUpdateAvailable)
+                .SetMainText(Phrases.Question_NewVersionWhWz_Title)
                 .SetExtraText(popupExtraText)
                 .AwaitAnswer();
         });

WheelWizard/Features/AutoUpdating/Platforms/LinuxUpdatePlatform.cs

@@ -28,13 +28,13 @@ public async Task<OperationResult> ExecuteUpdateAsync(string downloadUrl)
     {
         var currentExecutablePath = Environment.ProcessPath;
         if (currentExecutablePath is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         var currentExecutableName = fileSystem.Path.GetFileName(currentExecutablePath);
         var currentFolder = fileSystem.Path.GetDirectoryName(currentExecutablePath);
 
         if (currentFolder is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         // Download the new executable to a temporary file.
         var newFilePath = fileSystem.Path.Combine(currentFolder, currentExecutableName + "_new");
@@ -44,8 +44,8 @@ public async Task<OperationResult> ExecuteUpdateAsync(string downloadUrl)
         await DownloadHelper.DownloadToLocationAsync(
             downloadUrl,
             newFilePath,
-            Phrases.PopupText_UpdateWhWz,
-            Phrases.PopupText_LatestWhWzGithub,
+            Phrases.Progress_UpdateWhWz,
+            Phrases.Progress_LatestWhWzGithub,
             ForceGivenFilePath: true
         );
 
@@ -66,7 +66,7 @@ private OperationResult CreateAndRunShellScript(string currentFilePath, string n
     {
         var currentFolder = fileSystem.Path.GetDirectoryName(currentFilePath);
         if (currentFolder is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         var scriptFilePath = fileSystem.Path.Combine(currentFolder, "update.sh");
         var originalFileName = fileSystem.Path.GetFileName(currentFilePath);

WheelWizard/Features/AutoUpdating/Platforms/WindowsUpdatePlatform.cs

@@ -24,8 +24,8 @@ public async Task<OperationResult> ExecuteUpdateAsync(string downloadUrl)
 
         // Otherwise, ask if the user wants to restart as admin.
         var restartAsAdmin = await new YesNoWindow()
-            .SetMainText(Phrases.PopupText_UpdateAdmin)
-            .SetExtraText(Phrases.PopupText_UpdateAdminExplained)
+            .SetMainText(Phrases.Question_UpdateAdmin_Title)
+            .SetExtraText(Phrases.Question_UpdateAdmin_Extra)
             .AwaitAnswer();
 
         if (!restartAsAdmin)
@@ -50,7 +50,7 @@ private static OperationResult RestartAsAdmin()
                 Process.Start(startInfo);
                 Environment.Exit(0);
             },
-            errorMessage: Phrases.PopupText_RestartAdminFail
+            errorMessage: Phrases.MessageError_RestartAdminFail_Extra
         );
     }
 
@@ -68,13 +68,13 @@ private async Task<OperationResult> UpdateAsync(string downloadUrl)
     {
         var currentExecutablePath = Environment.ProcessPath;
         if (currentExecutablePath is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         var currentExecutableName = fileSystem.Path.GetFileNameWithoutExtension(currentExecutablePath);
         var currentFolder = fileSystem.Path.GetDirectoryName(currentExecutablePath);
 
         if (currentFolder is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         // Download new executable to a temporary file.
         var newFilePath = fileSystem.Path.Combine(currentFolder, currentExecutableName + "_new.exe");
@@ -84,8 +84,8 @@ private async Task<OperationResult> UpdateAsync(string downloadUrl)
         await DownloadHelper.DownloadToLocationAsync(
             downloadUrl,
             newFilePath,
-            Phrases.PopupText_UpdateWhWz,
-            Phrases.PopupText_LatestWhWzGithub,
+            Phrases.Progress_UpdateWhWz,
+            Phrases.Progress_LatestWhWzGithub,
             ForceGivenFilePath: true
         );
 
@@ -106,7 +106,7 @@ private OperationResult CreateAndRunPowerShellScript(string currentFilePath, str
     {
         var currentFolder = fileSystem.Path.GetDirectoryName(currentFilePath);
         if (currentFolder is null)
-            return Phrases.PopupText_UnableUpdateWhWz_ReasonLocation;
+            return Fail(Phrases.MessageWarning_UnableUpdateWhWz_Extra_ReasonLocation);
 
         var scriptFilePath = fileSystem.Path.Combine(currentFolder, "update.ps1");
         var originalFileName = fileSystem.Path.GetFileName(currentFilePath);