mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-4684] Content Metadata Card dates should be localised (#4944)
* [ADF-4684] Content Metadata Card dates should be localised * Passed locale param in datePipe * Set default locale value in card-view-dateitem model * Updated property locale in card-view-dateitem component on change in language * * Added test case * * Added unit test case * * Removing locale arg from datepipe
This commit is contained in:
@@ -71,7 +71,10 @@ export class CardViewDateItemComponent implements OnInit, OnDestroy {
|
|||||||
this.userPreferencesService
|
this.userPreferencesService
|
||||||
.select(UserPreferenceValues.Locale)
|
.select(UserPreferenceValues.Locale)
|
||||||
.pipe(takeUntil(this.onDestroy$))
|
.pipe(takeUntil(this.onDestroy$))
|
||||||
.subscribe(locale => this.dateAdapter.setLocale(locale));
|
.subscribe(locale => {
|
||||||
|
this.dateAdapter.setLocale(locale);
|
||||||
|
this.property.locale = locale;
|
||||||
|
});
|
||||||
|
|
||||||
(<MomentDateAdapter> this.dateAdapter).overrideDisplayFormat = 'MMM DD';
|
(<MomentDateAdapter> this.dateAdapter).overrideDisplayFormat = 'MMM DD';
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ export class CardViewDateItemModel extends CardViewBaseItemModel implements Card
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cardViewDateItemProperties.locale) {
|
if (cardViewDateItemProperties.locale) {
|
||||||
this.format = cardViewDateItemProperties.locale;
|
this.locale = cardViewDateItemProperties.locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -22,6 +22,9 @@ import { UserPreferencesService } from '../services/user-preferences.service';
|
|||||||
import { of } from 'rxjs';
|
import { of } from 'rxjs';
|
||||||
import { setupTestBed } from '../testing/setupTestBed';
|
import { setupTestBed } from '../testing/setupTestBed';
|
||||||
import { CoreTestingModule } from '../testing/core.testing.module';
|
import { CoreTestingModule } from '../testing/core.testing.module';
|
||||||
|
import { registerLocaleData } from '@angular/common';
|
||||||
|
import localeFr from '@angular/common/locales/fr';
|
||||||
|
registerLocaleData(localeFr);
|
||||||
|
|
||||||
describe('LocalizedDatePipe', () => {
|
describe('LocalizedDatePipe', () => {
|
||||||
|
|
||||||
@@ -53,4 +56,16 @@ describe('LocalizedDatePipe', () => {
|
|||||||
expect(pipe.transform(date, 'MMM dd')).toBe('Nov 03');
|
expect(pipe.transform(date, 'MMM dd')).toBe('Nov 03');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should return time with given locale', () => {
|
||||||
|
const date = new Date('1990-12-03 00:00');
|
||||||
|
const locale = 'fr';
|
||||||
|
expect(pipe.transform(date, null, locale)).toBe('3 déc. 1990');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return time with given format and locale', () => {
|
||||||
|
const date = new Date('1990-07-03 00:00');
|
||||||
|
const locale = 'fr';
|
||||||
|
const format = 'longDate';
|
||||||
|
expect(pipe.transform(date, format, locale)).toBe('3 juillet 1990');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user