i18n emails

app/mailers/submitter_mailer.rb

@@ -23,21 +23,23 @@ class SubmitterMailer < ApplicationMailer
 
     reply_to = build_submitter_reply_to(@submitter)
 
-    subject =
+    I18n.with_locale(@current_account.locale) do
-      if @email_config || @subject
+      subject =
-        ReplaceEmailVariables.call(@subject || @email_config.value['subject'], submitter:)
+        if @email_config || @subject
-      elsif @submitter.with_signature_fields?
+          ReplaceEmailVariables.call(@subject || @email_config.value['subject'], submitter:)
-        I18n.t(:you_are_invited_to_sign_a_document)
+        elsif @submitter.with_signature_fields?
-      else
+          I18n.t(:you_are_invited_to_sign_a_document)
-        I18n.t(:you_are_invited_to_submit_a_form)
+        else
-      end
+          I18n.t(:you_are_invited_to_submit_a_form)
+        end
 
-    mail(
+      mail(
-      to: @submitter.friendly_name,
+        to: @submitter.friendly_name,
-      from: from_address_for_submitter(submitter),
+        from: from_address_for_submitter(submitter),
-      subject:,
+        subject:,
-      reply_to:
+        reply_to:
-    )
+      )
+    end
   end
 
   def completed_email(submitter, user, to: nil)
@@ -66,13 +68,15 @@ class SubmitterMailer < ApplicationMailer
 
     assign_message_metadata('submitter_completed', @submitter)
 
-    subject =
+    I18n.with_locale(@current_account.locale) do
-      ReplaceEmailVariables.call(@subject.presence || I18n.t(:template_name_has_been_completed_by_submitters),
+      subject =
-                                 submitter:)
+        ReplaceEmailVariables.call(@subject.presence || I18n.t(:template_name_has_been_completed_by_submitters),
+                                   submitter:)
 
-    mail(from: from_address_for_submitter(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:)
+           subject:)
+    end
   end
 
   def declined_email(submitter, user)
@@ -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,17 +120,19 @@ class SubmitterMailer < ApplicationMailer
     assign_message_metadata('submitter_documents_copy', @submitter)
     reply_to = build_submitter_reply_to(submitter)
 
-    subject =
+    I18n.with_locale(@current_account.locale) do
-      if @subject.present?
+      subject =
-        ReplaceEmailVariables.call(@subject, submitter:)
+        if @subject.present?
-      else
+          ReplaceEmailVariables.call(@subject, submitter:)
-        I18n.t(:your_document_copy)
+        else
-      end
+          I18n.t(:your_document_copy)
+        end
 
-    mail(from: from_address_for_submitter(submitter),
+      mail(from: from_address_for_submitter(submitter),
-         to: to || @submitter.friendly_name,
+           to: to || @submitter.friendly_name,
-         reply_to:,
+           reply_to:,
-         subject:)
+           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