ENGCOM-1243: [Forwardport] Fix translate issue #14558

Stanislav Idolov · web-flow · commit 6bc5f27c445c · 2018-04-05T22:44:00.000+03:00
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -312,6 +312,9 @@ protected function _addData($data)
     {
         foreach ($data as $key => $value) {
             if ($key === $value) {
+                if (isset($this->_data[$key])) {
+                    unset($this->_data[$key]);
+                }
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,9 @@ protected function _addData($data)`
`312`	`312`	`{`
`313`	`313`	`foreach ($data as $key => $value) {`
`314`	`314`	`if ($key === $value) {`
	`315`	`+ if (isset($this->_data[$key])) {`
	`316`	`+ unset($this->_data[$key]);`
	`317`	`+ }`
`315`	`318`	`continue;`
`316`	`319`	`}`
`317`	`320`