diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv index 064b6428387fe..cd550015401d0 100644 --- 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!
This action will remove this user from already assigned role.
Are you sure?","Warning!
This action will remove this user from already assigned role.
Are you sure?" +"Warning!
This action will remove those users from already assigned roles.
Are you sure?","Warning!
This action will remove those users from already assigned roles.
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 index 2042479832898..b0107a53593d3 100644 --- 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!
This action will remove this user from already ' . + 'assigned role.
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!
This action will remove those users from already assigned roles.
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 index 71a866f945693..7455c26334c02 100644 --- 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!
This action will remove this user from already assigned role.
Are you sure?') )}") ) { checkbox[0].checked = false; for(i in radioBoxes) {