Skip to content

Commit cd01eba

Browse files
author
Joan He
committed
Merge remote-tracking branch 'engcom/libs-upgrade' into fix-calls-count
2 parents b5eefe5 + 83c2aff commit cd01eba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function execute()
100100
} catch (\Exception $e) {
101101
$this->logger->critical($e);
102102
$result = [
103-
'error' => _('UI component could not be rendered because of system exception'),
103+
'error' => __('UI component could not be rendered because of system exception'),
104104
'errorcode' => $this->escaper->escapeHtml($e->getCode())
105105
];
106106
/** @var \Magento\Framework\Controller\Result\Json $resultJson */

composer.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)