Skip to content

Commit 437830c

Browse files
committed
Merge remote-tracking branch 'l3/MC-38442' into PR30NovemberVRAD
2 parents 4764690 + 49a536c commit 437830c

File tree

3 files changed

+80
-69
lines changed

3 files changed

+80
-69
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
7+
<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.username}} @-->
88
<!--@vars {
99
"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",
10+
"var user.username":"User Name",
11+
"var user.firstname":"User First Name",
12+
"var user.lastname":"User Last Name",
1313
"var user.email":"User Email",
1414
"var store_email":"Store Email",
1515
"var store_phone":"Store Phone"
1616
} @-->
1717

1818
{{trans "Hello,"}}
1919

20-
{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.first_name last_name=$user.last_name email=$user.email}}
20+
{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.firstname last_name=$user.lastname email=$user.email}}
2121
{{trans "If you have not authorized this action, please contact us immediately at %store_email" store_email=$store_email |escape}}{{depend store_phone}} {{trans "or call us at %store_phone" store_phone=$store_phone |escape}}{{/depend}}.
2222

2323
{{trans "Thanks,"}}

dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template_new_user_notification.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
/** @var \Magento\Email\Model\Template $template */
99
$template = $objectManager->create(\Magento\Email\Model\Template::class);
1010
$template->setOptions(['area' => 'test area', 'store' => 1]);
11+
$templateText = '{{trans "New User Notification Custom Text %first_name, ' .
12+
'%last_name" first_name=$user.firstname last_name=$user.lastname}}';
1113
$template->setData(
1214
[
13-
'template_text' => 'New User Notification Custom Text',
15+
'template_text' => $templateText,
1416
'template_code' => 'New User Notification Custom Code',
1517
'template_type' => \Magento\Email\Model\Template::TYPE_TEXT,
1618
'orig_template_code' => 'admin_emails_new_user_notification_template'

0 commit comments

Comments
 (0)