Skip to content

Commit a18eecc

Browse files
committed
Fix duplicates of footer and incorrect greeting in some Magento_Customer emails
1 parent 5a9fcab commit a18eecc

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

app/code/Magento/Customer/view/frontend/email/change_email.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,10 @@
1212
} @-->
1313
{{template config_path="design/email/header_template"}}
1414

15-
<p class="greeting">{{trans "Hello,"}}</p>
16-
<br>
17-
15+
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
1816
<p>
1917
{{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
2018
{{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}}.
2119
</p>
22-
<br>
23-
24-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2520

2621
{{template config_path="design/email/footer_template"}}

app/code/Magento/Customer/view/frontend/email/change_email_and_password.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,10 @@
1212
} @-->
1313
{{template config_path="design/email/header_template"}}
1414

15-
<p class="greeting">{{trans "Hello,"}}</p>
16-
<br>
17-
15+
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
1816
<p>
1917
{{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}}
2018
{{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}}.
2119
</p>
22-
<br>
23-
24-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2520

2621
{{template config_path="design/email/footer_template"}}

app/code/Magento/Customer/view/frontend/email/password_reset.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@
1313
} @-->
1414
{{template config_path="design/email/header_template"}}
1515

16-
<p class="greeting">{{trans "Hello,"}}</p>
17-
<br>
18-
16+
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
1917
<p>
2018
{{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
2119
{{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}}.
2220
</p>
23-
<br>
24-
25-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2621

2722
{{template config_path="design/email/footer_template"}}

0 commit comments

Comments
 (0)