diff --git a/src/app/examples/grid-localization.component.ts b/src/app/examples/grid-localization.component.ts index 4849e236d..07c777b4d 100644 --- a/src/app/examples/grid-localization.component.ts +++ b/src/app/examples/grid-localization.component.ts @@ -159,7 +159,7 @@ export class GridLocalizationComponent implements OnInit { ofKey: 'OF', lastUpdateKey: 'LAST_UPDATE', }, - dateFormat: 'yyyy-MM-dd hh:mm aaaaa\'m\'', + dateFormat: 'yyyy-MM-dd, hh:mm aaaaa\'m\'', hideTotalItemCount: false, hideLastUpdateTimestamp: false, }, diff --git a/src/app/modules/angular-slickgrid/components/__tests__/angular-slickgrid-constructor.spec.ts b/src/app/modules/angular-slickgrid/components/__tests__/angular-slickgrid-constructor.spec.ts index 04400bdbc..eb905d462 100644 --- a/src/app/modules/angular-slickgrid/components/__tests__/angular-slickgrid-constructor.spec.ts +++ b/src/app/modules/angular-slickgrid/components/__tests__/angular-slickgrid-constructor.spec.ts @@ -1320,7 +1320,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () = expect(component.columnDefinitions).toEqual(mockColDefs); expect(component.showCustomFooter).toBeTrue(); expect(component.customFooterOptions).toEqual({ - dateFormat: 'yyyy-MM-dd hh:mm aaaaa\'m\'', + dateFormat: 'yyyy-MM-dd, hh:mm aaaaa\'m\'', hideLastUpdateTimestamp: true, hideTotalItemCount: false, footerHeight: 20, @@ -1358,7 +1358,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () = expect(component.columnDefinitions).toEqual(mockColDefs); expect(component.showCustomFooter).toBeTrue(); expect(component.customFooterOptions).toEqual({ - dateFormat: 'yyyy-MM-dd hh:mm aaaaa\'m\'', + dateFormat: 'yyyy-MM-dd, hh:mm aaaaa\'m\'', hideLastUpdateTimestamp: true, hideTotalItemCount: false, footerHeight: 20, diff --git a/src/app/modules/angular-slickgrid/global-grid-options.ts b/src/app/modules/angular-slickgrid/global-grid-options.ts index 8de348a35..86761a11e 100644 --- a/src/app/modules/angular-slickgrid/global-grid-options.ts +++ b/src/app/modules/angular-slickgrid/global-grid-options.ts @@ -52,7 +52,7 @@ export const GlobalGridOptions: Partial = { width: 200, }, customFooterOptions: { - dateFormat: 'yyyy-MM-dd hh:mm aaaaa\'m\'', + dateFormat: 'yyyy-MM-dd, hh:mm aaaaa\'m\'', hideTotalItemCount: false, hideLastUpdateTimestamp: true, footerHeight: 20, diff --git a/test/cypress/integration/example12.spec.js b/test/cypress/integration/example12.spec.js index 1d17442ac..88856630e 100644 --- a/test/cypress/integration/example12.spec.js +++ b/test/cypress/integration/example12.spec.js @@ -43,7 +43,7 @@ describe('Example 12: Localization (i18n)', () => { .should($span => { const text = removeExtraSpaces($span.text()); // remove all white spaces const now = new Date(); - const dateFormatted = moment(now).format('YYYY-MM-DD hh:mm a'); + const dateFormatted = moment(now).format('YYYY-MM-DD, hh:mm a'); expect(text).to.eq(`Last Update ${dateFormatted} | 1500 of 1500 items`); }); }); @@ -104,7 +104,7 @@ describe('Example 12: Localization (i18n)', () => { .should($span => { const now = new Date(); const text = removeExtraSpaces($span.text()); // remove all white spaces - const dateFormatted = moment(now).format('YYYY-MM-DD hh:mm a'); + const dateFormatted = moment(now).format('YYYY-MM-DD, hh:mm a'); expect(text).to.eq(`Dernière mise à jour ${dateFormatted} | 1500 de 1500 éléments`); }); });