Skip to content

Commit 702c4a4

Browse files
Hwashiang Yunathanjosiah
authored andcommitted
MC-20550: Refactor CE and EE modules E-mail templates to use scalars variables
- Resolved static test failures in templates
1 parent cc40a25 commit 702c4a4

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

app/code/Magento/SendFriend/view/frontend/email/product_share.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
"var email":"Recipient Email address",
1111
"var name":"Recipient name",
1212
"var message|raw":"Sender custom message",
13-
"var sender_email":"Sender email",
14-
"var sender_name":"Sender name",
13+
"var sender_email":"Sender Email",
14+
"var sender_name":"Sender Name",
1515
"var product_url":"URL for Product",
16-
"var product_image":"URL for product small image (75 px)"
16+
"var product_image":"URL for product small image (75 px)",
17+
"var message":"Message"
1718
} @-->
1819

1920
{{template config_path="design/email/header_template"}}

app/code/Magento/User/view/adminhtml/email/new_user_notification.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
-->
77
<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
88
<!--@vars {
9-
"var store.frontend_name|escape":"Store Name"
9+
"var store.frontend_name":"Store Name",
10+
"var user.name":"User Name",
11+
"var user.first_name":"User First Name",
12+
"var user.last_name":"User Last Name",
13+
"var user.email":"User Email",
14+
"var store_email":"Store Email",
15+
"var store_phone":"Store Phone"
1016
} @-->
1117

1218
{{trans "Hello,"}}

app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
-->
77
<!--@subject {{trans "Password Reset Confirmation for %name" name=$user.name}} @-->
88
<!--@vars {
9+
"var store.frontend_name":"Store Name",
10+
"var user.id":"Account Holder Id",
11+
"var user.rp_token":"Reset Password Token",
912
"var user.name":"Account Holder Name",
1013
"store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL"
1114
} @-->

app/code/Magento/User/view/adminhtml/email/user_notification.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
-->
77
<!--@subject {{trans "New %changes for %user_name" changes=$changes user_name=$user.name}} @-->
88
<!--@vars {
9-
"var store.frontend_name|escape":"Store Name"
9+
"var store.frontend_name":"Store Name",
10+
"var store_name":"Store Name",
11+
"var store_email":"Store Email",
12+
"var store_phone":"Store Phone",
13+
"var changes":"Changes",
14+
"var user.name":"User Name"
1015
} @-->
1116

1217
{{trans "Hello,"}}

app/code/Magento/Wishlist/view/frontend/email/share_notification.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
-->
77
<!--@subject {{trans "Take a look at %customer_name's Wish List" customer_name=$customerName}} @-->
88
<!--@vars {
9+
"var store.frontend_name":"Store Name",
910
"var customerName":"Customer Name",
1011
"var viewOnSiteLink":"View Wish List URL",
1112
"var items|raw":"Wish List Items",

0 commit comments

Comments
 (0)