Skip to content

Commit 8f6d69e

Browse files
committed
replace interpolated text with [innerText]
We have an issue where the date picker is translated to german, but then the users browser gives them the option to translate the page. when the user does this and translates the page text values (month name for example) no long updates. Using [innerText] solves this.
1 parent 4a376e2 commit 8f6d69e

File tree

6 files changed

+42
-25
lines changed

6 files changed

+42
-25
lines changed

e2e/datpicker-e2e.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ describe('dpDayPicker dayPicker', () => {
183183

184184
it('should check the first day of the week', () => {
185185
page.dayPickerInput.click();
186-
expect(page.weekDayNames.getText()).toEqual(['Sun Mon Tue Wed Thu Fri Sat']);
186+
expect(page.weekDayNames.getText()).toEqual(['SunMonTueWedThuFriSat']);
187187
page.clickOnBody();
188188
page.firstDayOfWeekMonday.click();
189189
page.dayPickerInput.click();
190-
expect(page.weekDayNames.getText()).toEqual(['Mon Tue Wed Thu Fri Sat Sun']);
190+
expect(page.weekDayNames.getText()).toEqual(['MonTueWedThuFriSatSun']);
191191
});
192192

193193
it('should check month format', () => {
@@ -245,7 +245,7 @@ describe('dpDayPicker dayPicker', () => {
245245
page.weekDaysFormatInput.sendKeys('d');
246246

247247
page.dayPickerInput.click();
248-
expect(page.weekDayNames.getText()).toEqual(['0 1 2 3 4 5 6']);
248+
expect(page.weekDayNames.getText()).toEqual(['0123456']);
249249
});
250250

251251
it('should check dateFormat is working', () => {

e2e/locale-e2e.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@ describe('Locales', () => {
1313

1414
page.daytimePickerMenu.click();
1515
page.daytimePickerInput.click();
16-
expect(page.weekDayNames.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
16+
expect(page.weekDayNames.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
1717

1818
page.daytimeInlineMenu.click();
19-
expect(page.weekDayInline.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
19+
expect(page.weekDayInline.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
2020

2121
page.daytimeDirectiveMenu.click();
2222
page.daytimeDirectiveInput.click();
23-
expect(page.weekDayNames.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
23+
expect(page.weekDayNames.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
2424

2525
page.dayPickerMenu.click();
2626
page.dayPickerInput.click();
27-
expect(page.weekDayNames.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
27+
expect(page.weekDayNames.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
2828

2929
page.dayInlineMenu.click();
30-
expect(page.weekDayInline.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
30+
expect(page.weekDayInline.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
3131

3232
page.dayDirectiveMenu.click();
3333
page.dayDirectiveInput.click();
34-
expect(page.weekDayNames.getText()).toEqual(['א׳ ב׳ ג׳ ד׳ ה׳ ו׳ ש׳']);
34+
expect(page.weekDayNames.getText()).toEqual(['א׳ב׳ג׳ד׳ה׳ו׳ש׳']);
3535

3636
page.monthPickerMenu.click();
3737
page.monthPickerInput.click();

src/app/calendar-nav/calendar-nav.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<div class="dp-calendar-nav-container">
22
<div class="dp-nav-header">
3-
<span [hidden]="isLabelClickable">{{label}}</span>
3+
<span [hidden]="isLabelClickable"
4+
[innerText]="label">
5+
</span>
46
<button type="button"
57
class="dp-nav-header-btn"
68
[hidden]="!isLabelClickable"
7-
(click)="labelClicked()">
8-
{{label}}
9+
(click)="labelClicked()"
10+
[innerText]="label">
911
</button>
1012
</div>
1113

src/app/day-calendar/day-calendar.component.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,22 @@
1616
[ngClass]="{'dp-hide-near-month': !componentConfig.showNearMonthDays}">
1717
<div class="dp-weekdays">
1818
<span class="dp-calendar-weekday"
19-
*ngFor="let weekday of weekdays">
20-
{{getWeekdayName(weekday)}}
19+
*ngFor="let weekday of weekdays"
20+
[innerText]="getWeekdayName(weekday)">
2121
</span>
2222
</div>
2323
<div class="dp-calendar-week" *ngFor="let week of weeks">
24-
<span *ngIf="componentConfig.showWeekNumbers" class="dp-week-number">{{week[0].date.isoWeek()}}</span>
24+
<span class="dp-week-number"
25+
*ngIf="componentConfig.showWeekNumbers"
26+
[innerText]="week[0].date.isoWeek()">
27+
</span>
2528
<button type="button"
2629
class="dp-calendar-day"
2730
*ngFor="let day of week"
2831
(click)="dayClicked(day)"
2932
[disabled]="day.disabled"
30-
[ngClass]="getDayBtnCssClass(day)">
31-
{{getDayBtnText(day)}}
33+
[ngClass]="getDayBtnCssClass(day)"
34+
[innerText]="getDayBtnText(day)">
3235
</button>
3336
</div>
3437
</div>

src/app/month-calendar/month-calendar.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*ngFor="let month of monthRow"
2424
[disabled]="month.disabled"
2525
[ngClass]="getMonthBtnCssClass(month)"
26-
(click)="monthClicked(month)">
27-
{{month.text}}
26+
(click)="monthClicked(month)"
27+
[innerText]="month.text">
2828
</button>
2929
</div>
3030
</div>

src/app/time-select/time-select.component.html

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,41 @@
55
[disabled]="!showIncHour"
66
(click)="increase('hour')">
77
</button>
8-
<span class="dp-time-select-display-hours">{{hours}}</span>
8+
<span class="dp-time-select-display-hours"
9+
[innerText]="hours">
10+
</span>
911
<button type="button"
1012
class="dp-time-select-control-down"
1113
[disabled]="!showDecHour"
1214
(click)="decrease('hour')"></button>
1315
</li>
14-
<li class="dp-time-select-control dp-time-select-separator">{{componentConfig.timeSeparator}}</li>
16+
<li class="dp-time-select-control dp-time-select-separator"
17+
[innerText]="componentConfig.timeSeparator">
18+
</li>
1519
<li class="dp-time-select-control dp-time-select-control-minutes">
1620
<button type="button"
1721
class="dp-time-select-control-up"
1822
[disabled]="!showIncMinute"
1923
(click)="increase('minute')"></button>
20-
<span class="dp-time-select-display-minutes">{{minutes}}</span>
24+
<span class="dp-time-select-display-minutes"
25+
[innerText]="minutes">
26+
</span>
2127
<button type="button"
2228
[disabled]="!showDecMinute" class="dp-time-select-control-down"
2329
(click)="decrease('minute')"></button>
2430
</li>
2531
<ng-container *ngIf="componentConfig.showSeconds">
26-
<li class="dp-time-select-control dp-time-select-separator">{{componentConfig.timeSeparator}}</li>
32+
<li class="dp-time-select-control dp-time-select-separator"
33+
[innerText]="componentConfig.timeSeparator">
34+
</li>
2735
<li class="dp-time-select-control dp-time-select-control-seconds">
2836
<button type="button"
2937
class="dp-time-select-control-up"
3038
[disabled]="!showIncSecond"
3139
(click)="increase('second')"></button>
32-
<span class="dp-time-select-display-seconds">{{seconds}}</span>
40+
<span class="dp-time-select-display-seconds"
41+
[innerText]="seconds">
42+
</span>
3343
<button type="button"
3444
class="dp-time-select-control-down"
3545
[disabled]="!showDecSecond"
@@ -41,7 +51,9 @@
4151
class="dp-time-select-control-up"
4252
[disabled]="!showToggleMeridiem"
4353
(click)="toggleMeridiem()"></button>
44-
<span class="dp-time-select-display-meridiem">{{meridiem}}</span>
54+
<span class="dp-time-select-display-meridiem"
55+
[innerText]="meridiem">
56+
</span>
4557
<button type="button"
4658
class="dp-time-select-control-down"
4759
[disabled]="!showToggleMeridiem"

0 commit comments

Comments
 (0)