From 49a75e0305a387b91b64b3617e29ce224875fc26 Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Fri, 11 Sep 2020 15:32:04 +0200
Subject: [PATCH] Localizable strings in mail templates

---
 resources/views/email/form_owner.antlers.html  | 12 ++++++------
 .../views/email/form_owner_text.antlers.html   |  8 ++++----
 resources/views/email/form_sender.antlers.html | 18 +++++++++---------
 .../views/email/form_sender_text.antlers.html  | 14 +++++++-------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/views/email/form_owner.antlers.html b/resources/views/email/form_owner.antlers.html
index ffc55e88f..65f1c9310 100644
--- a/resources/views/email/form_owner.antlers.html
+++ b/resources/views/email/form_owner.antlers.html
@@ -25,9 +25,9 @@
                                 <tr>
                                     <td align="center" style="vertical-align:top; color:#1A202C; padding:22px" valign="top">
                                         <div>
-                                            <img src="{{ trans:strings.form_mail_logo }}" alt="" width="150px" height="auto" style="max-width:100%; margin-bottom:22px">
+                                            <img src="{{ trans:strings.form_mail_logo locale="{locale}" }}" alt="" width="150px" height="auto" style="max-width:100%; margin-bottom:22px">
                                         </div>
-                                        <p style='font-weight:700; margin-bottom:11px; font-family:"Poppins", sans-serif; margin:0; text-transform:uppercase'>{{ trans:strings.form_mail_body_owner }}</p>
+                                        <p style='font-weight:700; margin-bottom:11px; font-family:"Poppins", sans-serif; margin:0; text-transform:uppercase'>{{ trans:strings.form_mail_body_owner locale="{locale}" }}</p>
                                     </td>
                                 </tr>
                             </table>
@@ -48,7 +48,7 @@
                                                                         {{ if value }}
                                                                             <tr>
                                                                                 <td style='vertical-align:top; font-family:"Source Code Pro", monospace; padding:11px; border-bottom:#e3e3da 1px solid; font-size:14px' valign="top">
-                                                                                    <strong>{{ trans key="{display}" }}:</strong><br>
+                                                                                    <strong>{{ trans key="{display}" locale="{locale}" }}:</strong><br>
                                                                                     <pre style="white-space:pre-line; font-family:inherit; margin:0">{{ if (value | is_array) }}<ul>{{ value }}<li>{{ value }}</li>{{ /value }}</ul>{{ else }}{{ value }}{{ /if }}</pre>
                                                                                 </td>
                                                                             </tr>
@@ -59,7 +59,7 @@
                                                         </tr>
                                                         <tr align="center" style="padding:0 0 22px">
                                                             <td style='vertical-align:top; font-family:"Source Code Pro", monospace; padding:11px' valign="top">
-                                                                <span style="color:#918f8d; font-size:12px">{{ trans:strings.form_mail_submitted }} {{ now | timezone | format:r }}.</span>
+                                                                <span style="color:#918f8d; font-size:12px">{{ trans:strings.form_mail_submitted locale="{locale}" }} {{ now | timezone | format:r }}.</span>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -75,7 +75,7 @@
                             <table cellpadding="0" cellspacing="0" border="0" style="width:100%" width="100%">
                                 <tr>
                                     <td align="center" style="vertical-align:top; padding:22px; text-align:center; color:#918f8d; font-size:12px" valign="top">
-                                        <a href="{{ trans:strings.form_mail_url }}" style="color:#918f8d; text-decoration:underline; font-size:12px">{{ trans:strings.form_mail_from }}</a>
+                                        <a href="{{ trans:strings.form_mail_url locale="{locale}" }}" style="color:#918f8d; text-decoration:underline; font-size:12px">{{ trans:strings.form_mail_from locale="{locale}" }}</a>
                                     </td>
                                 </tr>
                             </table>
@@ -88,4 +88,4 @@
         </tr>
     </table>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/resources/views/email/form_owner_text.antlers.html b/resources/views/email/form_owner_text.antlers.html
index 9c943ab0b..dff2adf2b 100644
--- a/resources/views/email/form_owner_text.antlers.html
+++ b/resources/views/email/form_owner_text.antlers.html
@@ -1,9 +1,9 @@
 {{# This is the text email that goes to the owner of the site when a contact form has been submitted. #}}
-{{ trans:strings.form_mail_body_owner }} ({{ trans:strings.form_mail_title }})
+{{ trans:strings.form_mail_body_owner locale="{locale}" }} ({{ trans:strings.form_mail_title locale="{locale}" }})
 
 -
 {{ fields }}
-{{ trans key="{display}" }}:
+{{ trans key="{display}" locale="{locale}" }}:
 {{ if (value | is_array) }}
 {{ value }}
 {{ value }}
@@ -13,5 +13,5 @@
 {{ /if }}
 {{ /fields }}
 -
-{{ trans:strings.form_mail_submitted }} {{ now | timezone | format:r }}
-{{ trans:strings.form_mail_from }}
+{{ trans:strings.form_mail_submitted locale="{locale}" }} {{ now | timezone | format:r }}
+{{ trans:strings.form_mail_from locale="{locale}" }}
diff --git a/resources/views/email/form_sender.antlers.html b/resources/views/email/form_sender.antlers.html
index bcaeef018..8e56ba62d 100644
--- a/resources/views/email/form_sender.antlers.html
+++ b/resources/views/email/form_sender.antlers.html
@@ -25,9 +25,9 @@
                                 <tr>
                                     <td align="center" style="vertical-align:top; color:#1A202C; padding:22px" valign="top">
                                         <div>
-                                            <img src="{{ trans:strings.form_mail_logo }}" alt="" width="150px" height="auto" style="max-width:100%; margin-bottom:22px">
+                                            <img src="{{ trans:strings.form_mail_logo locale="{locale}" }}" alt="" width="150px" height="auto" style="max-width:100%; margin-bottom:22px">
                                         </div>
-                                        <p style='font-weight:700; margin-bottom:11px; font-family:"Poppins", sans-serif; margin:0; text-transform:uppercase'>{{ trans:strings.form_mail_from }}</p>
+                                        <p style='font-weight:700; margin-bottom:11px; font-family:"Poppins", sans-serif; margin:0; text-transform:uppercase'>{{ trans:strings.form_mail_from locale="{locale}" }}</p>
                                     </td>
                                 </tr>
                             </table>
@@ -44,10 +44,10 @@
                                                         <tbody>
                                                             <tr>
                                                                 <td style="vertical-align:top; padding:22px; border-bottom:22px solid #f9f9f8;" valign="top">
-                                                                    <p>{{ trans:strings.form_mail_greeting }} {{ first_name or name }},</p>
-                                                                    <p>{{ trans:strings.form_mail_body_sender }}</p>
-                                                                    <p>{{ trans:strings.form_mail_closing }},</p>
-                                                                    <p>{{ trans:strings.form_mail_from }}</p>
+                                                                    <p>{{ trans:strings.form_mail_greeting locale="{locale}" }} {{ first_name or name }},</p>
+                                                                    <p>{{ trans:strings.form_mail_body_sender locale="{locale}" }}</p>
+                                                                    <p>{{ trans:strings.form_mail_closing locale="{locale}" }},</p>
+                                                                    <p>{{ trans:strings.form_mail_from locale="{locale}" }}</p>
                                                                 </td>
                                                             </tr>
                                                         </tbody>
@@ -60,7 +60,7 @@
                                                                         {{ if value }}
                                                                             <tr>
                                                                                 <td style='vertical-align:top; font-family:"Source Code Pro", monospace; padding:11px; border-bottom:#e3e3da 1px solid; font-size:14px' valign="top">
-                                                                                    <strong>{{ trans key="{display}" }}:</strong><br>
+                                                                                    <strong>{{ trans key="{display}" locale="{locale}" }}:</strong><br>
                                                                                     <pre style="white-space:pre-line; font-family:inherit; margin:0">{{ if (value | is_array) }}<ul>{{ value }}<li>{{ value }}</li>{{ /value }}</ul>{{ else }}{{ value }}{{ /if }}</pre>
                                                                                 </td>
                                                                             </tr>
@@ -71,7 +71,7 @@
                                                         </tr>
                                                         <tr align="center" style="padding:0 0 22px">
                                                             <td style='vertical-align:top; font-family:"Source Code Pro", monospace; padding:11px' valign="top">
-                                                                <span style="color:#918f8d; font-size:12px">{{ trans:strings.form_mail_submitted }} {{ now | timezone | format:r }}.</span>
+                                                                <span style="color:#918f8d; font-size:12px">{{ trans:strings.form_mail_submitted locale="{locale}" }} {{ now | timezone | format:r }}.</span>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -87,7 +87,7 @@
                             <table cellpadding="0" cellspacing="0" border="0" style="width:100%" width="100%">
                                 <tr>
                                     <td align="center" style="vertical-align:top; padding:22px; text-align:center; color:#918f8d; font-size:12px" valign="top">
-                                        <a href="{{ trans:strings.form_mail_url }}" style="color:#918f8d; text-decoration:underline; font-size:12px">{{ trans:strings.form_mail_from }}</a>
+                                        <a href="{{ trans:strings.form_mail_url locale="{locale}" }}" style="color:#918f8d; text-decoration:underline; font-size:12px">{{ trans:strings.form_mail_from locale="{locale}" }}</a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/resources/views/email/form_sender_text.antlers.html b/resources/views/email/form_sender_text.antlers.html
index d3b305eb1..22adb463b 100644
--- a/resources/views/email/form_sender_text.antlers.html
+++ b/resources/views/email/form_sender_text.antlers.html
@@ -1,14 +1,14 @@
 {{# This is the text email that goes to the sender of the contact form. #}}
-{{ trans:strings.form_mail_greeting }} {{ first_name or name }},
+{{ trans:strings.form_mail_greeting locale="{locale}" }} {{ first_name or name }},
 
-{{ trans:strings.form_mail_body_sender }}
+{{ trans:strings.form_mail_body_sender locale="{locale}" }}
 
-{{ trans:strings.form_mail_closing }},
-{{ trans:strings.form_mail_from }}
+{{ trans:strings.form_mail_closing locale="{locale}" }},
+{{ trans:strings.form_mail_from locale="{locale}" }}
 
 -
 {{ fields }}
-{{ trans key="{display}" }}:
+{{ trans key="{display}" locale="{locale}" }}:
 {{ if (value | is_array) }}
 {{ value }}
 {{ value }}
@@ -18,5 +18,5 @@
 {{ /if }}
 {{ /fields }}
 -
-{{ trans:strings.form_mail_submitted }} {{ now | timezone | format:r }}
-{{ trans:strings.form_mail_from }}
+{{ trans:strings.form_mail_submitted locale="{locale}" }} {{ now | timezone | format:r }}
+{{ trans:strings.form_mail_from locale="{locale}" }}