Skip to content

Commit a9532e1

Browse files
committed
Merge remote-tracking branch '38683/38682-fix-deploy-package-type-error' into community_prs_april
2 parents e6f56b1 + c8adafc commit a9532e1

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/code/Magento/Deploy/Service/DeployPackage.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,13 @@ public function deployEmulated(Package $package, array $options, $skipLogging =
133133
try {
134134
$this->processFile($file, $package);
135135
} catch (ContentProcessorException $exception) {
136-
$errorMessage = __('Compilation from source: ')
137-
. $file->getSourcePath()
138-
. PHP_EOL . $exception->getMessage() . PHP_EOL;
136+
$errorMessage = __(
137+
'Compilation from source: %1',
138+
$file->getSourcePath()
139+
. PHP_EOL
140+
. $exception->getMessage()
141+
. PHP_EOL
142+
);
139143
$this->errorsCount++;
140144
$this->logger->critical($errorMessage);
141145
$package->deleteFile($file->getFileId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"The configuration file has changed. Run app:config:import or setup:upgrade command to synchronize configuration.","The configuration file has changed. Run app:config:import or setup:upgrade command to synchronize configuration."
1313
"Wrong type specified: '%1'","Wrong type specified: '%1'"
1414
"Wrong queue type specified.","Wrong queue type specified."
15-
"Compilation from source: ","Compilation from source: "
15+
"Compilation from source: %1","Compilation from source: %1"
1616
"Wrong deploy strategy type: %1","Wrong deploy strategy type: %1"
1717
"Some error","Some error"
1818
"some message","some message"

0 commit comments

Comments
 (0)