Skip to content

Commit 7226b92

Browse files
Merge remote-tracking branch '39307/ckd/minor-copyedit' into febcomprs
2 parents 292769a + c92be00 commit 7226b92

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

app/code/Magento/ImportExport/Model/Import.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\ImportExport\Model;
@@ -79,7 +79,7 @@ class Import extends AbstractModel
7979
public const FIELD_NAME_ALLOWED_ERROR_COUNT = 'allowed_error_count';
8080

8181
/**
82-
* Validation startegt field name
82+
* Validation strategy field name
8383
*/
8484
public const FIELD_NAME_VALIDATION_STRATEGY = 'validation_strategy';
8585

@@ -904,7 +904,7 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
904904
$this->_varDirectory->writeFile($copyFile, $content);
905905
}
906906
} catch (FileSystemException $e) {
907-
throw new LocalizedException(__('Source file coping failed'));
907+
throw new LocalizedException(__('Source file copying failed'));
908908
}
909909
$this->importHistoryModel->addReport($copyName);
910910
}

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -1011,7 +1011,7 @@ public function testCreateHistoryReportExtensionIsSet()
10111011
public function testCreateHistoryReportThrowException()
10121012
{
10131013
$this->expectException(LocalizedException::class);
1014-
$this->expectExceptionMessage('Source file coping failed');
1014+
$this->expectExceptionMessage('Source file copying failed');
10151015
$sourceFileRelative = null;
10161016
$entity = '';
10171017
$extension = '';

app/code/Magento/ImportExport/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Status,Status
9090
"Import data validation is complete.","Import data validation is complete."
9191
"The behavior token for %1 is invalid.","The behavior token for %1 is invalid."
9292
"Please enter a correct entity model","Please enter a correct entity model"
93-
"Source file coping failed","Source file coping failed"
93+
"Source file copying failed","Source file copying failed"
9494
"The source is not set.","The source is not set."
9595
"The adapter type must be a non-empty string.","The adapter type must be a non-empty string."
9696
"'%1' file extension is not supported","'%1' file extension is not supported"

0 commit comments

Comments
 (0)