Skip to content

Commit cd2d8e0

Browse files
committed
MC-17269: Date format grid is not based on the locale defined in the back-office
1 parent 8fe6061 commit cd2d8e0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
2020
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
2121
<waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
22-
<see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
22+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
2323
</actionGroup>
2424
</actionGroups>

app/code/Magento/Ui/Component/Listing/Columns/Date.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class Date extends Column
5454
* @param BooleanUtils $booleanUtils
5555
* @param array $components
5656
* @param array $data
57-
* @param ResolverInterface $localeResolver
58-
* @param DataBundle $dataBundle
57+
* @param ResolverInterface|null $localeResolver
58+
* @param DataBundle|null $dataBundle
5959
*/
6060
public function __construct(
6161
ContextInterface $context,

0 commit comments

Comments
 (0)