inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix localisation in Datetimepicker (#2851)

Browse Source
This commit is contained in:
Popovics András
2018-01-22 10:54:07 +00:00
committed by Eugenio Romano
parent c4d9f9c829
commit d189567853
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts
View File

@@ -17,7 +17,8 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
import { MatDatetimepicker } from '@mat-datetimepicker/core'; import { MatDatetimepicker, DatetimeAdapter, MAT_DATETIME_FORMATS } from '@mat-datetimepicker/core';
import { MomentDatetimeAdapter, MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetimepicker/moment';
import moment from 'moment-es6'; import moment from 'moment-es6';
import { Moment } from 'moment'; import { Moment } from 'moment';
import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
@@ -29,7 +30,10 @@ import { MOMENT_DATE_FORMATS } from '../../../utils/moment-date-formats.model';
@Component({ @Component({
providers: [ providers: [
{ provide: DateAdapter, useClass: MomentDateAdapter }, { provide: DateAdapter, useClass: MomentDateAdapter },
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }], { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS },
{ provide: DatetimeAdapter, useClass: MomentDatetimeAdapter },
{ provide: MAT_DATETIME_FORMATS, useValue: MAT_MOMENT_DATETIME_FORMATS }
],
selector: 'adf-card-view-dateitem', selector: 'adf-card-view-dateitem',
templateUrl: './card-view-dateitem.component.html', templateUrl: './card-view-dateitem.component.html',
styleUrls: ['./card-view-dateitem.component.scss'] styleUrls: ['./card-view-dateitem.component.scss']
@@ -61,8 +65,7 @@ export class CardViewDateItemComponent implements OnInit {
this.preferences.locale$.subscribe((locale) => { this.preferences.locale$.subscribe((locale) => {
this.dateAdapter.setLocale(locale); this.dateAdapter.setLocale(locale);
}); });
let momentDateAdapter = <MomentDateAdapter> this.dateAdapter; (<MomentDateAdapter> this.dateAdapter).overrideDisplyaFormat = this.SHOW_FORMAT;
momentDateAdapter.overrideDisplyaFormat = this.SHOW_FORMAT;
if (this.property.value) { if (this.property.value) {
this.valueDate = moment(this.property.value, this.SHOW_FORMAT); this.valueDate = moment(this.property.value, this.SHOW_FORMAT);