Skip to content

Commit 254c5cd

Browse files
author
Joan He
committed
Merge remote-tracking branch 'origin/MAGETWO-43679-xml-validation-happes-in-production' into develop
2 parents c662a96 + 424716e commit 254c5cd

File tree

190 files changed

+2781
-1453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+2781
-1453
lines changed

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

app/code/Magento/Backend/Block/Widget/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
187187
$fieldType,
188188
[
189189
'name' => $attribute->getAttributeCode(),
190-
'label' => $attribute->getFrontend()->getLabel(),
190+
'label' => $attribute->getFrontend()->getLocalizedLabel(),
191191
'class' => $attribute->getFrontend()->getClass(),
192192
'required' => $attribute->getIsRequired(),
193193
'note' => $attribute->getNote()

0 commit comments

Comments
 (0)