#5697: [2.1.0] Misleading feedback when sending tracking information …

…email
magento · Jan 17, 2018 · f03e614 · f03e614
1 parent 8848d94
commit f03e614
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php
@@ -57,7 +57,9 @@ public function execute()
                 $this->_objectManager->create(\Magento\Shipping\Model\ShipmentNotifier::class)
                     ->notify($shipment);
                 $shipment->save();
-                $this->messageManager->addSuccess(__('You sent the shipment.'));
+                $this->messageManager->addSuccess(
+                    __('An email confirming the order is underway has been sent to the customer.')
+                );
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());

diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php
@@ -207,7 +207,7 @@ public function testEmail()
             ->will($this->returnValue(true));
         $this->messageManager->expects($this->once())
             ->method('addSuccess')
-            ->with('You sent the shipment.');
+            ->with('An email confirming the order is underway has been sent to the customer.');
         $path = '*/*/view';
         $arguments = ['shipment_id' => $shipmentId];
         $this->prepareRedirect($path, $arguments, 0);

diff --git a/app/code/Magento/Shipping/i18n/en_US.csv b/app/code/Magento/Shipping/i18n/en_US.csv
@@ -28,7 +28,7 @@ Shipments,Shipments
 "Cannot add tracking number.","Cannot add tracking number."
 "You created the shipping label.","You created the shipping label."
 "An error occurred while creating shipping label.","An error occurred while creating shipping label."
-"You sent the shipment.","You sent the shipment."
+"An email confirming the order is underway has been sent to the customer.","An email confirming the order is underway has been sent to the customer."
 "Cannot send shipment information.","Cannot send shipment information."
 "There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
 "New Shipment","New Shipment"