Skip to content

Commit b0915f1

Browse files
committed
Merge remote-tracking branch 'ed/php8-compatibility/fix-magento-phrases' into platform-health
2 parents e55418f + 3b7d0ef commit b0915f1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/code/Magento/Dhl/Model/Carrier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ function (array $a, array $b): int {
994994
$code = $bodyXml->xpath('//GetQuoteResponse/Note/Condition/ConditionCode');
995995
if (isset($code[0]) && (int)$code[0] == self::CONDITION_CODE_SERVICE_DATE_UNAVAILABLE) {
996996
$debugPoint['info'] = sprintf(
997-
__("DHL service is not available at %s date"),
997+
__("DHL service is not available at %s date")->render(),
998998
$responseData['date']
999999
);
10001000
$unavailable = true;

app/code/Magento/Email/Model/Template/Filter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ public function filter($value)
11211121
$this->resetAfterFilterCallbacks();
11221122

11231123
if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
1124-
$value = sprintf(__('Error filtering template: %s'), $e->getMessage());
1124+
$value = sprintf(__('Error filtering template: %s')->render(), $e->getMessage());
11251125
} else {
11261126
$value = (string) __("We're sorry, an error has occurred while generating this content.");
11271127
}

0 commit comments

Comments
 (0)