Skip to content

Commit a5907e5

Browse files
committed
MAGETWO-86881: Misleading feedback when sending tracking information email #1245
- Merge Pull Request magento-engcom/magento2ce#1245 from nmalevanec/magento2:5697 - Merged commits: 1. f03e614
2 parents 83a9b9c + f03e614 commit a5907e5

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public function execute()
5757
$this->_objectManager->create(\Magento\Shipping\Model\ShipmentNotifier::class)
5858
->notify($shipment);
5959
$shipment->save();
60-
$this->messageManager->addSuccess(__('You sent the shipment.'));
60+
$this->messageManager->addSuccess(
61+
__('An email confirming the order is underway has been sent to the customer.')
62+
);
6163
}
6264
} catch (\Magento\Framework\Exception\LocalizedException $e) {
6365
$this->messageManager->addError($e->getMessage());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function testEmail()
207207
->will($this->returnValue(true));
208208
$this->messageManager->expects($this->once())
209209
->method('addSuccess')
210-
->with('You sent the shipment.');
210+
->with('An email confirming the order is underway has been sent to the customer.');
211211
$path = '*/*/view';
212212
$arguments = ['shipment_id' => $shipmentId];
213213
$this->prepareRedirect($path, $arguments, 0);

app/code/Magento/Shipping/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Shipments,Shipments
2828
"Cannot add tracking number.","Cannot add tracking number."
2929
"You created the shipping label.","You created the shipping label."
3030
"An error occurred while creating shipping label.","An error occurred while creating shipping label."
31-
"You sent the shipment.","You sent the shipment."
31+
"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."
3232
"Cannot send shipment information.","Cannot send shipment information."
3333
"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
3434
"New Shipment","New Shipment"

0 commit comments

Comments
 (0)