MAGETWO-67296: String localization is not working when phrase contains quote (\')

- Remove unnecessary escaping in translation and add escape to post-translated string

Author: tjwiebell

app/code/Magento/Customer/Block/Adminhtml/Edit.php

@@ -10,7 +10,8 @@
 use Magento\Customer\Controller\RegistryConstants;
 
 /**
- * Customer edit block
+ * @deprecated for UiComponent replacement
+ * @see app/code/Magento/Customer/view/base/ui_component/customer_form.xml
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -115,12 +116,13 @@ protected function _construct()
 
         if ($customerId) {
             $url = $this->getUrl('customer/customer/invalidateToken', ['customer_id' => $customerId]);
-            $deleteConfirmMsg = __("Are you sure you want to revoke the customer\'s tokens?");
+            $deleteConfirmMsg = __("Are you sure you want to revoke the customer's tokens?");
             $this->buttonList->add(
                 'invalidate_token',
                 [
                     'label' => __('Force Sign-In'),
-                    'onclick' => 'deleteConfirm(\'' . $deleteConfirmMsg . '\', \'' . $url . '\')',
+                    'onclick' => 'deleteConfirm(\'' . $this->escapeJs($this->escapeHtml($deleteConfirmMsg)) .
+                        '\', \'' . $url . '\')',
                     'class' => 'invalidate-token'
                 ],
                 10

app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php

@@ -21,12 +21,11 @@ public function getButtonData()
         $customerId = $this->getCustomerId();
         $data = [];
         if ($customerId) {
-            $deleteConfirmMsg = __("Are you sure you want to revoke the customer\'s tokens?");
+            $deleteConfirmMsg = __("Are you sure you want to revoke the customer's tokens?");
             $data = [
                 'label' => __('Force Sign-In'),
                 'class' => 'invalidate-token',
-                'on_click' => 'deleteConfirm(\'' . $deleteConfirmMsg . '\', \'' . $this->getInvalidateTokenUrl() .
-                    '\')',
+                'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() . '")',
                 'sort_order' => 65,
             ];
         }

app/code/Magento/User/Block/User/Edit.php

@@ -65,13 +65,14 @@ protected function _construct()
                 ]
             );
 
-            $deleteConfirmMsg = __("Are you sure you want to revoke the user\'s tokens?");
+            $deleteConfirmMsg = __("Are you sure you want to revoke the user's tokens?");
             $this->addButton(
                 'invalidate',
                 [
                     'label' => __('Force Sign-In'),
                     'class' => 'invalidate-token',
-                    'onclick' => "deleteConfirm('" . $deleteConfirmMsg . "', '" . $this->getInvalidateUrl() . "')",
+                    'onclick' => "deleteConfirm('" . $this->escapeJs($this->escapeHtml($deleteConfirmMsg)) .
+                        "', '" . $this->getInvalidateUrl() . "')",
                 ]
             );
         }