From f99ae4ddf32873bed7e6e1cb5a2237a84fe4ff16 Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Wed, 13 Dec 2017 15:51:15 +0000
Subject: [PATCH] Reverted change for product code "O"
Product code "O" changed in error. This reverts the change.
---
app/code/Magento/Dhl/Model/Carrier.php | 2 +-
app/code/Magento/Dhl/i18n/en_US.csv | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index a9bdc99e8dc..9a26efee744 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -608,7 +608,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
'W' => __('Economy select'),
'I' => __('Domestic express 9:00'),
'N' => __('Domestic express'),
- 'O' => __('Domestic express 10:30'),
+ 'O' => __('Others'),
'R' => __('Globalmail business'),
'S' => __('Same day'),
'T' => __('Express 12:00'),
diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv
index 998cc51c636..a5532c2cea9 100644
--- a/app/code/Magento/Dhl/i18n/en_US.csv
+++ b/app/code/Magento/Dhl/i18n/en_US.csv
@@ -24,6 +24,7 @@ Europack,Europack
"Domestic economy select","Domestic economy select"
"Economy select","Economy select"
"Domestic express","Domestic express"
+Others,Others
"Globalmail business","Globalmail business"
"Same day","Same day"
"Express 12:00","Express 12:00"
@@ -79,5 +80,4 @@ Size,Size
"Sort Order","Sort Order"
Debug,Debug
"Domestic express 9:00","Domestic express 9:00"
-"Domestic express 10:30","Domestic express 10:30"
"Domestic express 12:00","Domestic express 12:00"
--
GitLab