i18n emails

app/mailers/submitter_mailer.rb

@@ -23,6 +23,7 @@ class SubmitterMailer < ApplicationMailer
 
     reply_to = build_submitter_reply_to(@submitter)
 
+    I18n.with_locale(@current_account.locale) do
       subject =
         if @email_config || @subject
           ReplaceEmailVariables.call(@subject || @email_config.value['subject'], submitter:)
@@ -39,6 +40,7 @@ class SubmitterMailer < ApplicationMailer
         reply_to:
       )
     end
+  end
 
   def completed_email(submitter, user, to: nil)
     @current_account = submitter.submission.account
@@ -66,14 +68,16 @@ class SubmitterMailer < ApplicationMailer
 
     assign_message_metadata('submitter_completed', @submitter)
 
+    I18n.with_locale(@current_account.locale) do
       subject =
         ReplaceEmailVariables.call(@subject.presence || I18n.t(:template_name_has_been_completed_by_submitters),
                                    submitter:)
 
       mail(from: from_address_for_submitter(submitter),
-         to: to || (user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name),
+           to: to || normalize_user_email(user),
            subject:)
     end
+  end
 
   def declined_email(submitter, user)
     @current_account = submitter.submission.account
@@ -83,7 +87,7 @@ class SubmitterMailer < ApplicationMailer
 
     assign_message_metadata('submitter_declined', @submitter)
 
-    I18n.with_locale(submitter.account.locale) do
+    I18n.with_locale(@current_account.locale) do
       mail(from: from_address_for_submitter(submitter),
            to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
            reply_to: @submitter.friendly_name,
@@ -116,6 +120,7 @@ class SubmitterMailer < ApplicationMailer
     assign_message_metadata('submitter_documents_copy', @submitter)
     reply_to = build_submitter_reply_to(submitter)
 
+    I18n.with_locale(@current_account.locale) do
       subject =
         if @subject.present?
           ReplaceEmailVariables.call(@subject, submitter:)
@@ -128,6 +133,7 @@ class SubmitterMailer < ApplicationMailer
            reply_to:,
            subject:)
     end
+  end
 
   private
 
@@ -171,6 +177,10 @@ class SubmitterMailer < ApplicationMailer
     documents
   end
 
+  def normalize_user_email(user)
+    user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name
+  end
+
   def add_attachments_with_size_limit(storage_attachments, current_size)
     total_size = current_size