refactored

nuxeo · Sep 3, 2024 · 1c736ad · 1c736ad
1 parent 27637ee
commit 1c736ad
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ui/widgets/nuxeo-date-picker.js b/ui/widgets/nuxeo-date-picker.js
@@ -195,10 +195,12 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior.js';
       moment.locale(window.nuxeo.I18n.language ? window.nuxeo.I18n.language.split('-')[0] : 'en');
       // tell vaadin-date-picker how to display dates since default behavior is US locales (MM-DD-YYYY)
       // this way we can take advantage of moment locale and use the date format that is most suitable for the user
-      const convertedFormat = this.format ? this.format : moment.localeData().longformat('L');
-      this.$.date.set('i18n.formatDate', (date) => this._moment(date).format(convertedFormat));
+    //  const convertedFormat = this.format ? this.format : moment.localeData().longformat('L');
+      this.$.date.set('i18n.formatDate', (date) => this._moment(date).format(this.format ? this.format : moment.localeData().longDateFormat('L')));
+     // this.$.date.set('i18n.formatDate', (date) => this._moment(date).format(convertedFormat));
       this.$.date.set('i18n.parseDate', (text) => {
-        const date = this._moment(text, convertedFormat);
+      //  const date = this._moment(text, convertedFormat);
+      const date = this._moment(text, this.format ? this.format : moment.localeData().longDateFormat('L'));
         return {
           day: date.get('D'),
           month: date.get('M'),