Use the same greeting as in other Magento Customer emails

magento · Apr 4, 2020 · 1ac923d · 1ac923d
1 parent b307274
commit 1ac923d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -8,13 +8,12 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.

diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -8,13 +8,12 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.

diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -9,13 +9,12 @@
 "var customer.name":"Customer Name",
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.