feat: Misc localising

2 files changed, 12 insertions, 9 deletions

diff --git a/code/api/src/Services/PasswordResetService.cs b/code/api/src/Services/PasswordResetService.cs
index 8c8e32b..1897d44 100644
--- a/code/api/src/Services/PasswordResetService.cs
+++ b/code/api/src/Services/PasswordResetService.cs
@@ -1,3 +1,5 @@
+using Microsoft.Extensions.Localization;
+
 namespace IOL.GreatOffice.Api.Services;
 
 public class PasswordResetService
@@ -6,17 +8,18 @@ public class PasswordResetService
     private readonly MailService _mailService;
     private readonly AppConfiguration _configuration;
     private readonly ILogger<PasswordResetService> _logger;
+    private readonly IStringLocalizer<SharedResources> _localizer;
 
     public PasswordResetService(
         MainAppDatabase database,
         VaultService vaultService,
         ILogger<PasswordResetService> logger,
-        MailService mailService
-    ) {
+        MailService mailService, IStringLocalizer<SharedResources> localizer) {
         _database = database;
         _configuration = vaultService.GetCurrentAppConfiguration();
         _logger = logger;
         _mailService = mailService;
+        _localizer = localizer;
     }
 
     public async Task<PasswordResetRequest> GetRequestAsync(Guid id, CancellationToken cancellationToken = default) {
@@ -52,17 +55,17 @@ public class PasswordResetService
         var zonedExpirationDate = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(request.ExpirationDate, requestTz.Id);
         var message = new MailService.PostmarkEmail() {
             To = request.User.Username,
-            Subject = "Reset password - Greatoffice",
-            TextBody = @$"
-Hi {user.Username}
+            Subject = _localizer["Reset password - Greatoffice"],
+            TextBody = _localizer["""
+Hi {0},
 
 Go to the following link to set a new password.
 
-{_configuration.CANONICAL_FRONTEND_URL}/reset-password/{request.Id}
+{1}/reset-password/{2}
 
-The link expires at {zonedExpirationDate:yyyy-MM-dd hh:mm}.
+The link expires at {3}.
 If you did not request a password reset, no action is required.
-"
+""", user.DisplayName(true), _configuration.CANONICAL_FRONTEND_URL, request.Id, zonedExpirationDate.ToString("yyyy-MM-dd hh:mm")]
         };
 
 #pragma warning disable 4014
diff --git a/code/api/src/Services/UserService.cs b/code/api/src/Services/UserService.cs
index 4c632be..4fd2aa4 100644
--- a/code/api/src/Services/UserService.cs
+++ b/code/api/src/Services/UserService.cs
@@ -90,7 +90,7 @@ public class UserService
 Hello, {0}.
 
 Validate your email address by opening this link in a browser {1}
-""", user.DisplayName(), EmailValidationUrl + "?id=" + queueItem.Id]
+""", user.DisplayName(true), EmailValidationUrl + "?id=" + queueItem.Id]
         };
         await _mailService.SendMail(email);
         queueItem.EmailSentAt = DateTime.UtcNow;