Skip to content

Commit 179f02c

Browse files
committed
Revert changes to greeting, keep only changes regarding duplicated footer
1 parent 7fa9dd7 commit 179f02c

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<!--@vars {
99
"var store.frontend_name":"Store Name",
1010
"var store_email":"Store Email",
11-
"var store_phone":"Store Phone",
12-
"var customer.name":"Customer Name"
11+
"var store_phone":"Store Phone"
1312
} @-->
1413
{{template config_path="design/email/header_template"}}
1514

16-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15+
<p class="greeting">{{trans "Hello,"}}</p>
16+
<br>
17+
1718
<p>
1819
{{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
1920
{{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}}.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<!--@vars {
99
"var store.frontend_name":"Store Name",
1010
"var store_email":"Store Email",
11-
"var store_phone":"Store Phone",
12-
"var customer.name":"Customer Name"
11+
"var store_phone":"Store Phone"
1312
} @-->
1413
{{template config_path="design/email/header_template"}}
1514

16-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15+
<p class="greeting">{{trans "Hello,"}}</p>
16+
<br>
17+
1718
<p>
1819
{{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}}
1920
{{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}}.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
"var customer.name":"Customer Name",
1010
"var store.frontend_name":"Store Name",
1111
"var store_email":"Store Email",
12-
"var store_phone":"Store Phone",
13-
"var customer.name":"Customer Name"
12+
"var store_phone":"Store Phone"
1413
} @-->
1514
{{template config_path="design/email/header_template"}}
1615

17-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
16+
<p class="greeting">{{trans "Hello,"}}</p>
17+
<br>
18+
1819
<p>
1920
{{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
2021
{{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}}.

0 commit comments

Comments
 (0)