Skip to content

Commit b89fc2f

Browse files
committed
Merge remote-tracking branch 'origin/imported-magento-magento2-31047' into 2.4-develop-pr112
2 parents 32353b8 + e899995 commit b89fc2f

File tree

2 files changed

+11
-2
lines changed
  • app/code/Magento/Ui/view/base/web/js/form/element
  • dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element

2 files changed

+11
-2
lines changed

app/code/Magento/Ui/view/base/web/js/form/element/date.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ define([
127127
if (this.options.showsTime) {
128128
shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone);
129129
} else {
130-
shiftedValue = moment(value, this.outputDateFormat);
130+
shiftedValue = moment(value, this.outputDateFormat, true);
131131
}
132132

133133
if (!shiftedValue.isValid()) {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ define([
4040
name: '',
4141
index: '',
4242
dataScope: dataScope,
43+
outputDateFormat: 'DD-MM-YYYY',
44+
inputDateFormat: 'YYYY-MM-DD',
45+
pickerDateTimeFormat: 'DD-MM-YYYY',
4346
options: {
44-
showsTime: true
47+
showsTime: false,
48+
dateFormat: 'dd-MM-y'
4549
}
4650
});
4751
utils = mageUtils;
@@ -56,5 +60,10 @@ define([
5660
expect(utils.convertToMomentFormat).toHaveBeenCalled();
5761
});
5862

63+
it('Check date will have correct value with different locales.', function () {
64+
model.value('2020-11-28');
65+
expect(model.getPreview()).toBe('28-11-2020');
66+
});
67+
5968
});
6069
});

0 commit comments

Comments
 (0)