Merge remote-tracking branch 'l3/MC-38442' into PR30NovemberVRAD

Author: victor-v-rad

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

@@ -4,20 +4,20 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
+<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.username}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
-"var user.name":"User Name",
-"var user.first_name":"User First Name",
-"var user.last_name":"User Last Name",
+"var user.username":"User Name",
+"var user.firstname":"User First Name",
+"var user.lastname":"User Last Name",
 "var user.email":"User Email",
 "var store_email":"Store Email",
 "var store_phone":"Store Phone"
 } @-->
 
 {{trans "Hello,"}}
 
-{{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}}
+{{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}}
 {{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}}.
 
 {{trans "Thanks,"}}

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

@@ -8,9 +8,11 @@
 /** @var \Magento\Email\Model\Template $template */
 $template = $objectManager->create(\Magento\Email\Model\Template::class);
 $template->setOptions(['area' => 'test area', 'store' => 1]);
+$templateText = '{{trans "New User Notification Custom Text %first_name, ' .
+    '%last_name" first_name=$user.firstname last_name=$user.lastname}}';
 $template->setData(
     [
-        'template_text' => 'New User Notification Custom Text',
+        'template_text' => $templateText,
         'template_code' => 'New User Notification Custom Code',
         'template_type' => \Magento\Email\Model\Template::TYPE_TEXT,
         'orig_template_code' => 'admin_emails_new_user_notification_template'