From ca39c3ddbd67ce0fcc2d3a780a2eb5d227a67a9a Mon Sep 17 00:00:00 2001 From: CKD Date: Mon, 28 Oct 2024 13:26:36 -0700 Subject: [PATCH 1/7] change "coping" to "copying" --- app/code/Magento/ImportExport/Model/Import.php | 2 +- app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php | 2 +- app/code/Magento/ImportExport/i18n/en_US.csv | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index ee8059a9780d4..d07834216b048 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -904,7 +904,7 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension $this->_varDirectory->writeFile($copyFile, $content); } } catch (FileSystemException $e) { - throw new LocalizedException(__('Source file coping failed')); + throw new LocalizedException(__('Source file copying failed')); } $this->importHistoryModel->addReport($copyName); } diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php index 26f6443cce971..dc21ef42085d8 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php @@ -1011,7 +1011,7 @@ public function testCreateHistoryReportExtensionIsSet() public function testCreateHistoryReportThrowException() { $this->expectException(LocalizedException::class); - $this->expectExceptionMessage('Source file coping failed'); + $this->expectExceptionMessage('Source file copying failed'); $sourceFileRelative = null; $entity = ''; $extension = ''; diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv index cc1098841bab8..d62b100740467 100644 --- a/app/code/Magento/ImportExport/i18n/en_US.csv +++ b/app/code/Magento/ImportExport/i18n/en_US.csv @@ -89,7 +89,7 @@ Status,Status "Import data validation is complete.","Import data validation is complete." "The behavior token for %1 is invalid.","The behavior token for %1 is invalid." "Please enter a correct entity model","Please enter a correct entity model" -"Source file coping failed","Source file coping failed" +"Source file copying failed","Source file copying failed" "The source is not set.","The source is not set." "The adapter type must be a non-empty string.","The adapter type must be a non-empty string." "'%1' file extension is not supported","'%1' file extension is not supported" From 09667d935166644514067eae3198aa8e7819b400 Mon Sep 17 00:00:00 2001 From: Carl Downing <200629+ckd@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:40:08 -0800 Subject: [PATCH 2/7] correct "strategy" spelling --- app/code/Magento/ImportExport/Model/Import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index 47e2667876498..7ca4f763a1660 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -79,7 +79,7 @@ class Import extends AbstractModel public const FIELD_NAME_ALLOWED_ERROR_COUNT = 'allowed_error_count'; /** - * Validation startegt field name + * Validation strategy field name */ public const FIELD_NAME_VALIDATION_STRATEGY = 'validation_strategy'; From dc920f40c51fa862e5dcb0d5d0974e33dd736501 Mon Sep 17 00:00:00 2001 From: Carl Downing <200629+ckd@users.noreply.github.com> Date: Thu, 20 Feb 2025 09:13:04 -0800 Subject: [PATCH 3/7] Update copyright notice --- app/code/Magento/ImportExport/Model/Import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index 7ca4f763a1660..e3cdf92a73e33 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -1,7 +1,7 @@ Date: Thu, 20 Feb 2025 09:18:12 -0800 Subject: [PATCH 4/7] Update copyright --- app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php index dc21ef42085d8..bfb1e2f3d99b7 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php @@ -1,7 +1,7 @@ Date: Thu, 20 Feb 2025 09:18:47 -0800 Subject: [PATCH 5/7] Update copyright notice --- app/code/Magento/ImportExport/Model/Import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index e3cdf92a73e33..1682e46ca1f85 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -1,7 +1,7 @@ Date: Fri, 21 Feb 2025 08:03:34 -0800 Subject: [PATCH 6/7] Correct copyright year --- app/code/Magento/ImportExport/Model/Import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index 1682e46ca1f85..5e2788bdbf13f 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -1,6 +1,6 @@ Date: Wed, 26 Feb 2025 17:05:16 +0530 Subject: [PATCH 7/7] Fix static test failures --- app/code/Magento/ImportExport/Model/Import.php | 2 +- app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index 5e2788bdbf13f..896a0bc3237aa 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -1,6 +1,6 @@