Skip to content

Commit d4ae0a8

Browse files
IvayloGjackofdiamond5
authored andcommitted
Merge branch 'bpenkov/igx-date-range' of https://github.com/IgniteUI/igniteui-angular into iganchev/date-range-aria
2 parents 8d25cce + 5936013 commit d4ae0a8

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export interface IRangeDatePickerResourceStrings {
2+
igx_range_date_picker_to?: string;
3+
}
4+
5+
export const RangeDatePickerResourceStringsEN: IRangeDatePickerResourceStrings = {
6+
igx_range_date_picker_to: 'to'
7+
};

projects/igniteui-angular/src/lib/core/i18n/resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { RangeDatePickerResourceStringsEN } from './range-date-picker-resources';
12
import { IGridResourceStrings, GridResourceStringsEN } from './grid-resources';
23
import { ITimePickerResourceStrings, TimePickerResourceStringsEN } from './time-picker-resources';
34
import { PaginatorResourceStringsEN } from './paginator-resources';
@@ -11,8 +12,9 @@ export interface IResourceStrings extends IGridResourceStrings, ITimePickerResou
1112
*/
1213
export const CurrentResourceStrings = {
1314
GridResStrings: cloneValue(GridResourceStringsEN),
14-
TimePickerResStrings: cloneValue(TimePickerResourceStringsEN),
1515
PaginatorResStrings: cloneValue(PaginatorResourceStringsEN),
16+
TimePickerResStrings: cloneValue(TimePickerResourceStringsEN),
17+
RangeDatePickerResStrings: cloneValue(RangeDatePickerResourceStringsEN),
1618
CarouselResStrings: cloneValue(CarouselResourceStringsEN),
1719
};
1820

projects/igniteui-angular/src/lib/date-range/igx-date-range.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<igx-icon>calendar_today</igx-icon>
5757
</div>
5858
<ng-content select="igx-date-start"></ng-content>
59-
<div>to</div> <!-- TODO: make templatable -->
59+
<div>{{ prepTo }}</div>
6060
<ng-content select="igx-date-end"></ng-content>
6161
</div>
6262
</ng-template>

projects/igniteui-angular/src/lib/date-range/igx-date-range.component.ts

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { IToggleView } from '../core/navigation';
2020
import { IgxLabelDirective, IgxPrefixDirective } from '../input-group';
2121
import { IgxInputGroupBase } from '../input-group/input-group.common';
2222
import { IgxDateTimeEditorEventArgs } from '../directives/date-time-editor';
23+
import { CurrentResourceStrings } from '../core/i18n/resources';
2324

2425
/**
2526
* Range Date Picker provides the ability to select a range of dates from the calendar UI.
@@ -259,6 +260,9 @@ export class IgxDateRangeComponent implements IToggleView, AfterViewInit, OnDest
259260
@ContentChild(IgxLabelDirective)
260261
public label: IgxLabelDirective;
261262

263+
/** @hidden */
264+
public prepTo = CurrentResourceStrings.RangeDatePickerResStrings.igx_range_date_picker_to;
265+
262266
/** @hidden @internal */
263267
public get appliedFormat() {
264268
// TODO: apply formatter if present

projects/igniteui-angular/src/public_api.ts

+1
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,6 @@ export { ICarouselResourceStrings } from './lib/core/i18n/carousel-resources';
105105
export { IGridResourceStrings } from './lib/core/i18n/grid-resources';
106106
export { IPaginatorResourceStrings } from './lib/core/i18n/paginator-resources';
107107
export { ITimePickerResourceStrings } from './lib/core/i18n/time-picker-resources';
108+
export { IRangeDatePickerResourceStrings } from './lib/core/i18n/range-date-picker-resources';
108109
export { InteractionMode } from './lib/core/enums';
109110

0 commit comments

Comments
 (0)