Merged in r2-3181-email-punc (pull request #7080)

R2-3181: Fixing no-theme emails have orphan punctuation marks

Approved-by: Pavel Nabutovsky

Author: jtoliver-quoin

app/models/theme.rb

@@ -90,7 +90,8 @@ def site_name
   end
 
   def t(key, locale)
-    data.dig(key, locale) || data.dig(key, I18n.locale.to_s) || ''
+    data.dig(key, locale) || data.dig(key, I18n.default_locale.to_s) ||
+      DEFAULT_THEME.dig(key, 'en') || ''
   end
 
   def get(key, default_value = '')

app/views/layouts/mailer.html.erb

@@ -176,7 +176,7 @@
                         style="font-size:0px;padding:10px 25px;word-break:break-word;">
                         <div
                           style="font-family:-apple-system,BlinkMacSystemFont,avenir next,avenir,helvetica neue,helvetica,ubuntu,roboto,noto,segoe ui,arial,sans-serif;font-size:18px;line-height:30px;text-align:left;color:#4a4a4a;">
-                          <p><i><%= @theme.t('email_closing', @locale) %>,</i></p>
+                          <p><i><%= @theme.t('email_closing', @locale) %></i></p>
                           <p><b><%= @theme.t('email_signature', @locale) %></b></p>
                         </div>
                       </td>

config/locales/en.yml

@@ -4474,7 +4474,7 @@ en:
       subject: 'Welcome to %{system}!'
       subject_instructions: '%{system} Login Instructions'
       greeting: 'Welcome to %{system}!'
-      body_native: "%{greeting}! We are creating a %{role_name} account for you. You will receive a separate email to set up your password shortly. Once logged in please go to your user profile to find your username. You will find your user profile in the left navigation of Primero."
+      body_native: "%{greeting} We are creating a %{role_name} account for you. You will receive a separate email to set up your password shortly. Once logged in please go to your user profile to find your username. You will find your user profile in the left navigation of Primero."
       body_native2: "You can watch this %{instructional_video} if you need additional guidance."
       instructional_video: instructional video
       additional_support: 'Please contact your %{admin_email} if you need additional support.'
@@ -4558,6 +4558,6 @@ en:
     email_disclaimer_pre: DO NOT REPLY TO THIS EMAIL
     email_welcome_greeting: Welcome to the Primero team
     email_welcome_closing: Welcome to the Primero Community
-    email_closing: At your service
+    email_closing: At your service,
     email_signature: Primero team
     email_admin_name: System Administrator