Fixed #10503 - dateFormat option for I18N API

primefaces · Aug 13, 2021 · aee2f83 · aee2f83
1 parent 151680e
commit aee2f83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/app/components/api/primengconfig.ts b/src/app/components/api/primengconfig.ts
@@ -69,6 +69,7 @@ export class PrimeNGConfig {
         dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"],
         monthNames: ["January","February","March","April","May","June","July","August","September","October","November","December"],
         monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun","Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+        dateFormat: 'mm/dd/yy',
         today: 'Today',
         weekHeader: 'Wk',
         weak: 'Weak',

diff --git a/src/app/components/api/translation.ts b/src/app/components/api/translation.ts
@@ -34,6 +34,7 @@ export interface Translation {
     dayNamesMin?: string[];
     monthNames?: string[];
     monthNamesShort?: string[];
+    dateFormat?: string;
     today?: string;
     weekHeader?: string;
     weak?: string;

diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -216,7 +216,7 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
 
     @Input() disabled: any;
 
-    @Input() dateFormat: string = 'mm/dd/yy';
+    @Input() dateFormat: string;
 
     @Input() multipleSeparator: string = ',';
 
@@ -2168,7 +2168,7 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
     }
 
     getDateFormat() {
-        return this.dateFormat;
+        return this.dateFormat||this.getTranslation('dateFormat');
     }
 
     // Ported from jquery-ui datepicker formatDate