Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modal content with good message format for newlines #30014

Merged
merged 1 commit into from
Sep 19, 2020
Merged

Modal content with good message format for newlines #30014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/User/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 () {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down