Skip to content

Commit 8ecec7b

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

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
</arguments>
1515
<!-- Navigate to admin System Account Page-->
1616
<amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
17-
<waitForPageLoad stepKey="loadAdminSystemAccountPage"/>
18-
<!-- Change Admin locale to Français (France) / French (France) -->
17+
<waitForElementVisible selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="waitForInterfaceLocale"/>
1918
<selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
2019
<fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
21-
<click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
20+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
2221
<waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
22+
<see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
2323
</actionGroup>
2424
</actionGroups>

app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminSystemAccountSection">
12-
<element name="interfaceLocale" type="text" selector="#interface_locale"/>
12+
<element name="interfaceLocale" type="select" selector="#interface_locale"/>
1313
<element name="currentPassword" type="text" selector="#current_password"/>
1414
</section>
1515
</sections>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class Date extends Column
5252
* @param UiComponentFactory $uiComponentFactory
5353
* @param TimezoneInterface $timezone
5454
* @param BooleanUtils $booleanUtils
55-
* @param ResolverInterface $localeResolver
56-
* @param DataBundle $dataBundle
5755
* @param array $components
5856
* @param array $data
57+
* @param ResolverInterface $localeResolver
58+
* @param DataBundle $dataBundle
5959
*/
6060
public function __construct(
6161
ContextInterface $context,

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ define([
3939
*/
4040
getLabel: function (value, format) {
4141
var date;
42+
4243
if (this.storeLocale !== undefined) {
4344
moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
4445
}

0 commit comments

Comments
 (0)