MAGETWO-36131: Update Content in Magento 2 by Modules - part 3

- fixes after CR

Author: Dmytro Vilchynskyi

app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml

@@ -46,8 +46,8 @@
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.report.grid.columnSet">
                     <arguments>
                         <argument name="filter_visibility" xsi:type="string">0</argument>
-                        <argument name="empty_text" xsi:type="string" translate="true">We can\'t find records for this period.</argument>
-                        <argument name="empty_cell_label" xsi:type="string" translate="true">We can\'t find records for this period.</argument>
+                        <argument name="empty_text" xsi:type="string" translate="true">We can't find records for this period.</argument>
+                        <argument name="empty_cell_label" xsi:type="string" translate="true">We can't find records for this period.</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="period">
                         <arguments>

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php

@@ -132,7 +132,7 @@ public function getHeaderText()
         if ($this->getCreditmemo()->getEmailSent()) {
             $emailSent = __('The credit memo email was sent.');
         } else {
-            $emailSent = __('The credit memo email was not sent.');
+            $emailSent = __('The credit memo email wasn\'t sent.');
         }
         return __(
             'Credit Memo #%1 | %3 | %2 (%4)',

app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php

@@ -191,7 +191,7 @@ public function getHeaderText()
         if ($this->getInvoice()->getEmailSent()) {
             $emailSent = __('The invoice email was sent.');
         } else {
-            $emailSent = __('The invoice email was not sent.');
+            $emailSent = __('The invoice email wasn\'t sent.');
         }
         return __(
             'Invoice #%1 | %2 | %4 (%3)',

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php

@@ -76,7 +76,7 @@ public function execute()
             } else {
                 $response = [
                     'error' => true,
-                    'message' => __('Cannot initialize shipment for adding tracking number.'),
+                    'message' => __('We can\'t initialize shipment for adding tracking number.'),
                 ];
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php

@@ -61,11 +61,11 @@ public function execute()
                 } else {
                     $response = [
                         'error' => true,
-                        'message' => __('Cannot initialize shipment for delete tracking number.'),
+                        'message' => __('We can\'t initialize shipment for delete tracking number.'),
                     ];
                 }
             } catch (\Exception $e) {
-                $response = ['error' => true, 'message' => __('Cannot delete tracking number.')];
+                $response = ['error' => true, 'message' => __('We can\'t delete tracking number.')];
             }
         } else {
             $response = [

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/RemoveTrackTest.php

@@ -285,7 +285,7 @@ public function testExecuteShipmentLoadFail()
     {
         $errors = [
             'error' => true,
-            'message' => 'Cannot initialize shipment for delete tracking number.',
+            'message' => 'We can\'t initialize shipment for delete tracking number.',
         ];
         $this->shipmentLoad();
 
@@ -302,7 +302,7 @@ public function testExecuteShipmentLoadFail()
      */
     public function testExecuteDeleteFail()
     {
-        $errors = ['error' => true, 'message' => 'Cannot delete tracking number.'];
+        $errors = ['error' => true, 'message' => 'We can\'t delete tracking number.'];
         $this->shipmentLoad();
 
         $this->shipmentLoaderMock->expects($this->once())