Merge branch 'MAGNIMEX-13-Import-History-fix-label' into 'master'

A-Komar · A-Komar · commit c316bded7761 · 2015-06-17T17:36:53.000+03:00
Magnimex 13 import history fix label

See merge request !153
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
@@ -18,7 +18,7 @@ public function toArray()
         return [
             \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND => __('Add/Update'),
             \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __('Replace'),
-            \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete Entities')
+            \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete')
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function toArray()`
`18`	`18`	`return [`
`19`	`19`	`\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND => __('Add/Update'),`
`20`	`20`	`\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __('Replace'),`
`21`		`- \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete Entities')`
	`21`	`+ \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete')`
`22`	`22`	`];`
`23`	`23`	`}`
`24`	`24`