ENGCOM-8191: Modal content with good message format for newlines #30014

- Merge Pull Request #30014 from lfluvisotto/magento2:2.4-develop-issue-30013 - Merged commits: 1. de91c2b
magento · Sep 18, 2020 · 3435faf · 3435faf
2 parents 4aa2f11 + de91c2b
commit 3435faf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
@@ -106,8 +106,8 @@ username,username
 Custom,Custom
 All,All
 Resources,Resources
-"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
-"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?","Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?"
+"Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?","Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?"
 "Password Reset Confirmation for %name","Password Reset Confirmation for %name"
 "%name,","%name,"
 "There was recently a request to change the password for your account.","There was recently a request to change the password for your account."

diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -51,8 +51,8 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
 
                 if (checked) {
                     confirm({
-                        content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' .
-                                                         'assigned role\r\nAre you sure?'))}",
+                        content: "{$myBlock->escapeJs(__('Warning!<br>This action will remove this user from already ' .
+                                                         'assigned role.<br>Are you sure?'))}",
                         actions: {
                             confirm: function () {
                                 checkbox[0].checked = false;
@@ -102,7 +102,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
             allCheckbox.checked = true;
             confirm({
                 content: "{$myBlock->escapeJs(
-                    __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')
+                    __('Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?')
                     )}",
                 actions: {
                     confirm: function () {

diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -45,7 +45,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 if (checked && warning && radioBoxes.size() > 0) {
                     if ( !confirm("{$myBlock->escapeJs(
-                        __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')
+                        __('Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?')
                         )}") ) {
                         checkbox[0].checked = false;
                         for(i in radioBoxes) {