Skip to content

Commit efd77d3

Browse files
nathanjosiahnathanjosiah
authored
Merge pull request #4995 from magento-borg/scalar-pr-2
[borg] MC-19918: Introduce scalar variables only mode to E-mail templates
2 parents 4e3da15 + a2a68d1 commit efd77d3

File tree

139 files changed

+5090
-1097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+5090
-1097
lines changed

‎app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
-->
77
<!--@subject {{trans "Payment Transaction Failed Reminder"}} @-->
88
<!--@vars {
9-
"var billingAddress.format('html')|raw":"Billing Address",
9+
"var billingAddressHtml|raw":"Billing Address",
1010
"var checkoutType":"Checkout Type",
1111
"var customerEmail":"Customer Email",
1212
"var customer":"Customer Name",
1313
"var dateAndTime":"Date and Time of Transaction",
1414
"var paymentMethod":"Payment Method",
15-
"var shippingAddress.format('html')|raw":"Shipping Address",
15+
"var shippingAddressHtml|raw":"Shipping Address",
1616
"var shippingMethod":"Shipping Method",
1717
"var items|raw":"Shopping Cart Items",
1818
"var total":"Total",
@@ -44,11 +44,11 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
4444
</li>
4545
<li>
4646
<strong>{{trans "Billing Address:"}}</strong><br />
47-
{{var billingAddress.format('html')|raw}}
47+
{{var billingAddressHtml|raw}}
4848
</li>
4949
<li>
5050
<strong>{{trans "Shipping Address:"}}</strong><br />
51-
{{var shippingAddress.format('html')|raw}}
51+
{{var shippingAddressHtml|raw}}
5252
</li>
5353
<li>
5454
<strong>{{trans "Shipping Method:"}}</strong><br />

‎app/code/Magento/Customer/view/frontend/email/account_new.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
9+
"var store.frontend_name":"Store Name",
10+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
11+
"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
1012
"var customer.email":"Customer Email",
1113
"var customer.name":"Customer Name"
1214
} @-->
1315

1416
{{template config_path="design/email/header_template"}}
1517

1618
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
17-
<p>{{trans "Welcome to %store_name." store_name=$store.getFrontendName()}}</p>
19+
<p>{{trans "Welcome to %store_name." store_name=$store.frontend_name}}</p>
1820
<p>
1921
{{trans
2022
'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'

‎app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
9+
"var store.frontend_name":"Store Name",
10+
"var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])":"Account Confirmation URL",
1011
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
1112
"var customer.email":"Customer Email",
1213
"var customer.name":"Customer Name"

‎app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
9+
"var store.frontend_name":"Store Name",
10+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
11+
"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
1012
"var customer.email":"Customer Email",
1113
"var customer.name":"Customer Name"
1214
} @-->
1315
{{template config_path="design/email/header_template"}}
1416

1517
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
16-
<p>{{trans "Thank you for confirming your %store_name account." store_name=$store.getFrontendName()}}</p>
18+
<p>{{trans "Thank you for confirming your %store_name account." store_name=$store.frontend_name}}</p>
1719
<p>
1820
{{trans
1921
'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'

‎app/code/Magento/Customer/view/frontend/email/account_new_no_password.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
8-
<!--@vars {
9-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
7+
<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
8+
<!--@vars {
9+
"var store.frontend_name":"Store Name",
10+
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
11+
"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Create Password URL",
1012
"var customer.email":"Customer Email",
1113
"var customer.name":"Customer Name"
1214
} @-->
1315
{{template config_path="design/email/header_template"}}
1416

1517
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
16-
<p>{{trans "Welcome to %store_name." store_name=$store.getFrontendName()}}</p>
18+
<p>{{trans "Welcome to %store_name." store_name=$store.frontend_name}}</p>
1719
<p>
1820
{{trans
1921
'To sign in to our site and set a password, click on the <a href="%create_password_url">link</a>:'

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.getFrontendName()}} @-->
8-
<!--@vars {} @-->
7+
<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.frontend_name}} @-->
8+
<!--@vars {
9+
"var store.frontend_name":"Store Name",
10+
"var store_email":"Store Email",
11+
"var store_phone":"Store Phone"
12+
} @-->
913
{{template config_path="design/email/header_template"}}
1014

1115
<p class="greeting">{{trans "Hello,"}}</p>
1216
<br>
1317

1418
<p>
15-
{{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.getFrontendName()}}
19+
{{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
1620
{{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}}.
1721
</p>
1822
<br>
1923

20-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
24+
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2125

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

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.getFrontendName()}} @-->
8-
<!--@vars {} @-->
7+
<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.frontend_name}} @-->
8+
<!--@vars {
9+
"var store.frontend_name":"Store Name",
10+
"var store_email":"Store Email",
11+
"var store_phone":"Store Phone"
12+
} @-->
913
{{template config_path="design/email/header_template"}}
1014

1115
<p class="greeting">{{trans "Hello,"}}</p>
1216
<br>
1317

1418
<p>
15-
{{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.getFrontendName()}}
19+
{{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}}
1620
{{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}}.
1721
</p>
1822
<br>
1923

20-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
24+
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2125

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

‎app/code/Magento/Customer/view/frontend/email/password_new.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Reset your %store_name password" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var this.getUrl(store, 'customer/account/')":"Customer Account URL",
9+
"var store.frontend_name":"Store Name",
10+
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
11+
"var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
1012
"var customer.name":"Customer Name"
1113
} @-->
1214
{{template config_path="design/email/header_template"}}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name"
9+
"var customer.name":"Customer Name",
10+
"var store.frontend_name":"Store Name",
11+
"var store_email":"Store Email",
12+
"var store_phone":"Store Phone"
1013
} @-->
1114
{{template config_path="design/email/header_template"}}
1215

1316
<p class="greeting">{{trans "Hello,"}}</p>
1417
<br>
1518

1619
<p>
17-
{{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.getFrontendName()}}
20+
{{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
1821
{{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}}.
1922
</p>
2023
<br>
2124

22-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
25+
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2326

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

‎app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
7+
<!--@subject {{trans "Reset your %store_name password" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9+
"var store.frontend_name":"Store Name",
910
"var customer.name":"Customer Name",
10-
"var this.getUrl($store, 'customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"
11+
"var this.getUrl($store,'customer/account/createPassword/',[_query:[token:$customer.rp_token],_nosid:1])":"Reset Password URL"
1112
} @-->
1213
{{template config_path="design/email/header_template"}}
1314

0 commit comments

Comments
 (0)