Merge pull request #833 from hargata/Hargata/831

translatable Email correspondence
hargata · Jan 26, 2025 · 82a4f8d · 82a4f8d
2 parents 0555dcb + 538a793
commit 82a4f8d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/Helper/MailHelper.cs b/Helper/MailHelper.cs
@@ -15,16 +15,21 @@ public interface IMailHelper
     public class MailHelper : IMailHelper
     {
         private readonly MailConfig mailConfig;
+        private readonly string serverLanguage;
         private readonly IFileHelper _fileHelper;
+        private readonly ITranslationHelper _translator;
         private readonly ILogger<MailHelper> _logger;
         public MailHelper(
             IConfigHelper config,
             IFileHelper fileHelper,
+            ITranslationHelper translationHelper,
             ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
             mailConfig = config.GetMailConfig();
+            serverLanguage = config.GetServerLanguage();
             _fileHelper = fileHelper;
+            _translator = translationHelper;
             _logger = logger;
         }
         public OperationResponse NotifyUserForRegistration(string emailAddress, string token)
@@ -36,8 +41,8 @@ public OperationResponse NotifyUserForRegistration(string emailAddress, string t
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token)) {
                 return OperationResponse.Failed("Email Address or Token is invalid");
             }
-            string emailSubject = "Your Registration Token for LubeLogger";
-            string emailBody = $"A token has been generated on your behalf, please complete your registration for LubeLogger using the token: {token}";
+            string emailSubject = _translator.Translate(serverLanguage, "Your Registration Token for LubeLogger");
+            string emailBody = $"{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please complete your registration for LubeLogger using the token")}: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
@@ -57,8 +62,8 @@ public OperationResponse NotifyUserForPasswordReset(string emailAddress, string
             {
                 return OperationResponse.Failed("Email Address or Token is invalid");
             }
-            string emailSubject = "Your Password Reset Token for LubeLogger";
-            string emailBody = $"A token has been generated on your behalf, please reset your password for LubeLogger using the token: {token}";
+            string emailSubject = _translator.Translate(serverLanguage, "Your Password Reset Token for LubeLogger");
+            string emailBody = $"{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please reset your password for LubeLogger using the token")}: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
@@ -79,8 +84,8 @@ public OperationResponse NotifyUserForAccountUpdate(string emailAddress, string
             {
                 return OperationResponse.Failed("Email Address or Token is invalid");
             }
-            string emailSubject = "Your User Account Update Token for LubeLogger";
-            string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
+            string emailSubject = _translator.Translate(serverLanguage, "Your User Account Update Token for LubeLogger");
+            string emailBody = $"{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please update your account for LubeLogger using the token")}: {token}";
             var result = SendEmail(new List<string> { emailAddress}, emailSubject, emailBody);
             if (result)
             {
@@ -107,17 +112,18 @@ public OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> em
             }
             //get email template, this file has to exist since it's a static file.
             var emailTemplatePath = _fileHelper.GetFullFilePath(StaticHelper.ReminderEmailTemplate);
-            string emailSubject = $"Vehicle Reminders From LubeLogger - {DateTime.Now.ToShortDateString()}";
+            string emailSubject = $"{_translator.Translate(serverLanguage, "Vehicle Reminders From LubeLogger")} - {DateTime.Now.ToShortDateString()}";
             //construct html table.
             string emailBody = File.ReadAllText(emailTemplatePath);
             emailBody = emailBody.Replace("{VehicleInformation}", $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)}");
+            string tableHeader = $"<th>{_translator.Translate(serverLanguage, "Urgency")}</th><th>{_translator.Translate(serverLanguage, "Description")}</th><th>{_translator.Translate(serverLanguage, "Due")}</th>";
             string tableBody = "";
             foreach(ReminderRecordViewModel reminder in reminders)
             {
                 var dueOn = reminder.Metric == ReminderMetric.Both ? $"{reminder.Date.ToShortDateString()} or {reminder.Mileage}" : reminder.Metric == ReminderMetric.Date ? $"{reminder.Date.ToShortDateString()}" : $"{reminder.Mileage}";
-                tableBody += $"<tr class='{reminder.Urgency}'><td>{StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency)}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
+                tableBody += $"<tr class='{reminder.Urgency}'><td>{_translator.Translate(serverLanguage, StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency))}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
             }
-            emailBody = emailBody.Replace("{TableBody}", tableBody);
+            emailBody = emailBody.Replace("{TableHeader}", tableHeader).Replace("{TableBody}", tableBody);
             try
             {
                 var result = SendEmail(emailAddresses, emailSubject, emailBody);

diff --git a/Program.cs b/Program.cs
@@ -69,8 +69,8 @@
 builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
 builder.Services.AddSingleton<IReportHelper, ReportHelper>();
 builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
-builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
+builder.Services.AddSingleton<IMailHelper, MailHelper>();
 
 //configure logic
 builder.Services.AddSingleton<ILoginLogic, LoginLogic>();