Merge remote-tracking branch 'api/MAGETWO-52165-PS-API-FT-Fix-RevokeAllAccessTokensForAdminWithoutTokensTest' into MAGETWO-53121-502-Bad-Gateway

Cari Spruiell · Cari Spruiell · commit 3074d50dd161 · 2016-06-14T20:18:24.000-05:00
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
@@ -53,7 +53,7 @@ protected function _construct()
         $objId = $this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
-            $deleteConfirmMsg = __("Are you sure you want to revoke the users\\\\'s tokens?");
+            $deleteConfirmMsg = __("Are you sure you want to revoke the user\'s tokens?");
             $this->addButton(
                 'invalidate',
                 [

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function _construct()`
`53`	`53`	`$objId = $this->getRequest()->getParam($this->_objectId);`
`54`	`54`
`55`	`55`	`if (!empty($objId)) {`
`56`		`- $deleteConfirmMsg = __("Are you sure you want to revoke the users\\\\'s tokens?");`
	`56`	`+ $deleteConfirmMsg = __("Are you sure you want to revoke the user\'s tokens?");`
`57`	`57`	`$this->addButton(`
`58`	`58`	`'invalidate',`
`59`	`59`	`[`