Skip to content

Commit de91c2b

Browse files
committed
Modal content with good message format for newlines
1 parent 72f253e commit de91c2b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/code/Magento/User/i18n/en_US.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ username,username
106106
Custom,Custom
107107
All,All
108108
Resources,Resources
109-
"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?"
110-
"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?"
109+
"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?"
110+
"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?"
111111
"Password Reset Confirmation for %name","Password Reset Confirmation for %name"
112112
"%name,","%name,"
113113
"There was recently a request to change the password for your account.","There was recently a request to change the password for your account."

app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
5151
5252
if (checked) {
5353
confirm({
54-
content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' .
55-
'assigned role\r\nAre you sure?'))}",
54+
content: "{$myBlock->escapeJs(__('Warning!<br>This action will remove this user from already ' .
55+
'assigned role.<br>Are you sure?'))}",
5656
actions: {
5757
confirm: function () {
5858
checkbox[0].checked = false;
@@ -102,7 +102,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
102102
allCheckbox.checked = true;
103103
confirm({
104104
content: "{$myBlock->escapeJs(
105-
__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')
105+
__('Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?')
106106
)}",
107107
actions: {
108108
confirm: function () {

app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
4545
var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
4646
if (checked && warning && radioBoxes.size() > 0) {
4747
if ( !confirm("{$myBlock->escapeJs(
48-
__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')
48+
__('Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?')
4949
)}") ) {
5050
checkbox[0].checked = false;
5151
for(i in radioBoxes) {

0 commit comments

Comments
 (0)