Skip to content

Commit 29c1e82

Browse files
committed
BUG#AC-1285: Buttons with duplicate labels fixed on Product landing page, add/edit product, add/edit page, add/edit block
1 parent 9e87605 commit 29c1e82

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function getToggleAttributesHtml()
168168
'title' => $title,
169169
'class' => join(' ', $classes),
170170
'disabled' => $disabled,
171-
'aria-label' => $this->getData('dropDownAriaLabel') ?: '',
171+
'aria-label' => $this->getData('dropdown_button_aria_label') ?: '',
172172
];
173173
$this->_getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
174174

app/code/Magento/Catalog/Block/Adminhtml/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function _prepareLayout()
5959
'button_class' => '',
6060
'class_name' => \Magento\Backend\Block\Widget\Button\SplitButton::class,
6161
'options' => $this->_getAddProductButtonOptions(),
62-
'dropDownAriaLabel' => 'Add product of type'
62+
'dropdown_button_aria_label' => __('Add product of type'),
6363
];
6464
$this->buttonList->add('add_new', $addButtonProps);
6565

app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getButtonData()
4040
],
4141
'class_name' => Container::SPLIT_BUTTON,
4242
'options' => $this->getOptions(),
43-
'dropDownAriaLabel' => 'Save options',
43+
'dropdown_button_aria_label' => __('Save options'),
4444
];
4545
}
4646

app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function getButtonData()
3838
'class_name' => Container::SPLIT_BUTTON,
3939
'options' => $this->getOptions(),
4040
'sort_order' => 90,
41-
'dropDownAriaLabel' => 'Save options',
41+
'dropdown_button_aria_label' => __('Save options'),
4242
];
4343
}
4444

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getButtonData()
4040
],
4141
'class_name' => Container::SPLIT_BUTTON,
4242
'options' => $this->getOptions(),
43-
'dropDownAriaLabel' => 'Save options',
43+
'dropdown_button_aria_label' => __('Save options'),
4444
];
4545
}
4646

app/code/Magento/Ui/Component/Control/SplitButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function getToggleAttributesHtml()
165165
'title' => $title,
166166
'class' => join(' ', $classes),
167167
'disabled' => $disabled,
168-
'aria-label' => $this->getData('dropDownAriaLabel') ?: '',
168+
'aria-label' => $this->getData('dropdown_button_aria_label') ?: '',
169169
];
170170
$this->getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
171171

0 commit comments

Comments
 (0)