Skip to content

Commit 2624578

Browse files
author
MPopov
committed
simplify some of the resource strings
1 parent d141b38 commit 2624578

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

projects/igniteui-angular/src/lib/calendar/calendar.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<ng-template let-result #defaultMonth let-obj>
77
<span class="igx-calendar__aria-off-screen" aria-live="polite">
8-
{{ monthsViewNumber > 1 ? resourceStrings.igx_calendar_first_picker_of + ' ' + monthsViewNumber + ' ' + resourceStrings.igx_calendar_starts_from + ' ' + (getViewDate(obj.index) | date: 'LLLL yyyy') : resourceStrings.igx_calendar_selected_month_is + (getViewDate(obj.index) | date: 'LLLL yyyy')}}
8+
{{ monthsViewNumber > 1 ? (resourceStrings.igx_calendar_first_picker_of.replace('{0}', monthsViewNumber.toString()) + ' ' + (getViewDate(obj.index) | date: 'LLLL yyyy')) : resourceStrings.igx_calendar_selected_month_is + (getViewDate(obj.index) | date: 'LLLL yyyy')}}
99
</span>
1010
<span
1111
tabindex="0"
@@ -55,7 +55,7 @@ <h2 id="igx-aria-calendar-title-month" class="igx-calendar__header-date">
5555
<ng-container *ngIf="selection === 'range'">
5656
{{ resourceStrings.igx_calendar_range_selection }}
5757
</ng-container>
58-
{{ monthsViewNumber && monthsViewNumber > 1 ? (resourceStrings.igx_calendar_calendar_with + ' ' + monthsViewNumber + ' ' + resourceStrings.igx_calendar_date_pickers) : ''}}
58+
{{ monthsViewNumber && monthsViewNumber > 1 ? resourceStrings.igx_calendar_with_date_pickers.replace('{0}', monthsViewNumber.toString()) : ''}}
5959
</span>
6060
<div
6161
tabindex="0"

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ export interface ICalendarResourceStrings {
77
igx_calendar_range_end: string;
88
igx_calendar_selected_month_is: string;
99
igx_calendar_first_picker_of: string;
10-
igx_calendar_date_pickers: string;
11-
igx_calendar_starts_from: string;
1210
igx_calendar_multi_selection: string;
1311
igx_calendar_range_selection: string;
14-
igx_calendar_calendar_with: string;
12+
igx_calendar_with_date_pickers: string;
1513
}
1614

1715
export const CalendarResourceStringsEN: ICalendarResourceStrings = {
@@ -22,10 +20,8 @@ export const CalendarResourceStringsEN: ICalendarResourceStrings = {
2220
igx_calendar_range_start: 'Range start',
2321
igx_calendar_range_end: 'Range end',
2422
igx_calendar_selected_month_is: 'Selected month is',
25-
igx_calendar_first_picker_of: 'first picker of',
26-
igx_calendar_date_pickers: 'date pickers',
27-
igx_calendar_starts_from: 'starts from',
23+
igx_calendar_first_picker_of: 'first picker of {0} starts from',
2824
igx_calendar_multi_selection: 'multi selection',
2925
igx_calendar_range_selection: 'range selection',
30-
igx_calendar_calendar_with: 'calendar with',
26+
igx_calendar_with_date_pickers: 'calendar with {0} date pickers',
3127
};

0 commit comments

Comments
 (0)