From f03e6148d14ec0839626ac5705a5aa9e6eeef6b8 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 17 Jan 2018 11:25:46 +0200
Subject: [PATCH] magento/magento2#5697: [2.1.0] Misleading feedback when
sending tracking information email
---
.../Shipping/Controller/Adminhtml/Order/Shipment/Email.php | 4 +++-
.../Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php | 2 +-
app/code/Magento/Shipping/i18n/en_US.csv | 2 +-
3 files changed, 5 insertions(+), 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
index 1f5d6e2cb7a..f08204fdff0 100644
--- 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 @@ class Email extends \Magento\Backend\App\Action
$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
index 7e4e27efe5b..3507b7fe2e2 100644
--- 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 @@ class EmailTest extends \PHPUnit\Framework\TestCase
->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
index f777e64ef98..0bda9d2a714 100644
--- 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"
--
GitLab