From 2fbd1edbca371953eab2dd4c4cdb8a98b5a7f77c Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Thu, 8 Aug 2019 14:25:49 +0700
Subject: [PATCH 1/2] Resolve ImportExport module missing some translation

---
 app/code/Magento/ImportExport/i18n/en_US.csv                    | 2 ++
 .../view/adminhtml/templates/export/form/before.phtml           | 2 +-
 .../view/adminhtml/templates/import/form/before.phtml           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index d7680a71ac5f7..5787d6f7d02b6 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -123,3 +123,5 @@ Summary,Summary
 "New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
 "All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>","All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>"
 "Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
+"Invalid data","Invalid data"
+"Invalid response","Invalid response"
\ No newline at end of file
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index 26b241b999493..d097f0977f291 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -89,7 +89,7 @@ require([
             form.action   = oldAction;
         } else {
             alert({
-                content: 'Invalid data'
+                content: '<?php echo __('Invalid data'); ?>'
             });
         }
     };
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index 628c1088a016c..80ebe76361ece 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -209,7 +209,7 @@ require([
         postToFrameProcessResponse: function(response) {
             if ('object' != typeof(response)) {
                 alert({
-                    content: 'Invalid response'
+                    content: '<?php echo __('Invalid response'); ?>'
                 });
 
                 return false;

From 87c8e2ea8e400cf544756faf76316ae0d10c6d85 Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Thu, 8 Aug 2019 16:28:44 +0700
Subject: [PATCH 2/2] Fix static test

---
 .../view/adminhtml/templates/export/form/before.phtml           | 2 +-
 .../view/adminhtml/templates/import/form/before.phtml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index d097f0977f291..3e7a19a0c0d82 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -89,7 +89,7 @@ require([
             form.action   = oldAction;
         } else {
             alert({
-                content: '<?php echo __('Invalid data'); ?>'
+                content: '<?= $block->escapeHtml(__('Invalid data')); ?>'
             });
         }
     };
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index 80ebe76361ece..bd88ec419d848 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -209,7 +209,7 @@ require([
         postToFrameProcessResponse: function(response) {
             if ('object' != typeof(response)) {
                 alert({
-                    content: '<?php echo __('Invalid response'); ?>'
+                    content: '<?= $block->escapeHtml(__('Invalid response')); ?>'
                 });
 
                 return false;