Skip to content

Commit 834daea

Browse files
committed
fix(localization): Fix initialization of components to assign their locale and not globally.
1 parent 256431c commit 834daea

File tree

7 files changed

+9
-19
lines changed

7 files changed

+9
-19
lines changed

projects/igniteui-angular/src/lib/calendar/calendar-base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { noop, Subject } from 'rxjs';
66
import { getLocaleFirstDayOfWeek, isDate, isEqual, onResourceChangeHandle, PlatformUtil } from '../core/utils';
77
import { CalendarResourceStringsEN, ICalendarResourceStrings } from '../core/i18n/calendar-resources';
88
import { DateTimeUtil } from '../date-common/util/date-time.util';
9-
import { getCurrentResourceStrings, initi18n } from '../core/i18n/resources';
9+
import { getCurrentResourceStrings } from '../core/i18n/resources';
1010
import { KeyboardNavigationService } from './calendar.services';
1111
import { getYearRange, isDateInRanges } from './common/helpers';
1212
import { CalendarDay } from './common/model';
@@ -1019,8 +1019,8 @@ export class IgxCalendarBaseDirective implements ControlValueAccessor {
10191019
}
10201020

10211021
private initLocale() {
1022-
initi18n(this._localeId);
10231022
this._defaultLocale = getCurrentI18n();
1023+
this._locale = this._localeId !== this._defaultLocale ? this._localeId : this._locale;
10241024
this._localeWeekStart = getLocaleFirstDayOfWeek(this.locale);
10251025
onResourceChangeHandle(this._destroyRef, this.onResourceChange, this);
10261026
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,3 @@ export function getCurrentResourceStrings<T>(defaultEN: T, init = true) {
8181
export function changei18n(resourceStrings: IResourceStrings) {
8282
igxRegisterI18n(resourceStrings, getI18nManager().defaultLocale);
8383
}
84-
85-
export function initi18n(locale: string) {
86-
if (locale !== 'en-US') {
87-
//Default for angular is en-US, so don't set it on the i18n manager, because can override any other locale set by the new API.
88-
setCurrentI18n(locale);
89-
}
90-
}

projects/igniteui-angular/src/lib/date-common/picker-base.directive.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { IgxPrefixDirective } from '../directives/prefix/prefix.directive';
2020
import { IgxSuffixDirective } from '../directives/suffix/suffix.directive';
2121
import { IgxInputGroupComponent } from '../input-group/input-group.component';
2222
import { getCurrentI18n, IResourceChangeEventArgs } from 'igniteui-i18n-core';
23-
import { initi18n } from '../core/i18n/resources';
2423

2524
@Directive()
2625
export abstract class PickerBaseDirective implements IToggleView, EditorProvider, AfterViewInit, AfterContentChecked, OnDestroy {
@@ -361,8 +360,8 @@ export abstract class PickerBaseDirective implements IToggleView, EditorProvider
361360
}
362361

363362
protected initLocale() {
364-
initi18n(this._localeId);
365363
this._defaultLocale = getCurrentI18n();
364+
this._locale = this._localeId !== this._defaultLocale ? this._localeId : this._locale;
366365
}
367366

368367
protected onResourceChange(args: CustomEvent<IResourceChangeEventArgs>) {

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import {
6363
import { IDatePickerValidationFailedEventArgs } from './date-picker.common';
6464
import { IgxIconComponent } from '../icon/icon.component';
6565
import { IgxTextSelectionDirective } from '../directives/text-selection/text-selection.directive';
66-
import { getCurrentResourceStrings, initi18n } from '../core/i18n/resources';
66+
import { getCurrentResourceStrings } from '../core/i18n/resources';
6767
import { fadeIn, fadeOut } from 'igniteui-angular/animations';
6868
import { PickerCalendarOrientation } from '../date-common/types';
6969
import { IgxReadOnlyInputDirective } from '../directives/input/read-only-input.directive';
@@ -1007,7 +1007,6 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
10071007

10081008
protected override initLocale() {
10091009
super.initLocale();
1010-
initi18n(this._localeId);
10111010
onResourceChangeHandle(this._destroy$, this.onResourceChange, this);
10121011
}
10131012

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
import { DateRange, IgxDateRangeEndComponent, IgxDateRangeInputsBaseComponent, IgxDateRangeSeparatorDirective, IgxDateRangeStartComponent, DateRangePickerFormatPipe, CustomDateRange } from './date-range-picker-inputs.common';
3434
import { IgxPrefixDirective } from '../directives/prefix/prefix.directive';
3535
import { IgxIconComponent } from '../icon/icon.component';
36-
import { getCurrentResourceStrings, initi18n } from '../core/i18n/resources';
36+
import { getCurrentResourceStrings } from '../core/i18n/resources';
3737
import { fadeIn, fadeOut } from 'igniteui-angular/animations';
3838
import { PickerCalendarOrientation } from '../date-common/types';
3939
import { calendarRange, isDateInRanges } from '../calendar/common/helpers';
@@ -1272,7 +1272,6 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
12721272

12731273
protected override initLocale() {
12741274
super.initLocale();
1275-
initi18n(this._localeId);
12761275
onResourceChangeHandle(this._destroy$, this.onResourceChange, this);
12771276
}
12781277

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ import { IgxGridFilteringRowComponent } from './filtering/base/grid-filtering-ro
181181
import { DefaultDataCloneStrategy, IDataCloneStrategy } from '../data-operations/data-clone-strategy';
182182
import { IgxGridCellComponent } from './cell.component';
183183
import { IgxGridValidationService } from './grid/grid-validation.service';
184-
import { getCurrentResourceStrings, initi18n } from '../core/i18n/resources';
184+
import { getCurrentResourceStrings } from '../core/i18n/resources';
185185
import { isTree, recreateTree, recreateTreeFromFields } from '../data-operations/expressions-tree-util';
186186
import { getUUID } from './common/random';
187187
import { DefaultMergeStrategy, IGridMergeStrategy } from '../data-operations/merge-strategy';
@@ -8281,8 +8281,8 @@ export abstract class IgxGridBaseDirective implements GridType,
82818281
}
82828282

82838283
private initLocale() {
8284-
initi18n(this.localeId);
82858284
this._defaultLocale = getCurrentI18n();
8285+
this._locale = this.localeId !== this._defaultLocale ? this.localeId : this._locale;
82868286
onResourceChangeHandle(this.destroy$, this.onResourceChange, this);
82878287
}
82888288

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { IgxInputGroupComponent } from '../input-group/input-group.component';
3636
import { IgxSelectItemComponent } from '../select/select-item.component';
3737
import { IgxPrefixDirective } from '../directives/prefix/prefix.directive';
3838
import { IgxIconComponent } from '../icon/icon.component';
39-
import { getCurrentResourceStrings, initi18n } from '../core/i18n/resources';
39+
import { getCurrentResourceStrings } from '../core/i18n/resources';
4040
import { IgxIconButtonDirective } from '../directives/button/icon-button.directive';
4141
import { IComboSelectionChangingEventArgs, IgxComboComponent } from "../combo/combo.component";
4242
import { IgxComboHeaderDirective } from '../combo/public_api';
@@ -1722,8 +1722,8 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
17221722
}
17231723

17241724
private initLocale() {
1725-
initi18n(this._localeId);
17261725
this._defaultLocale = getCurrentI18n();
1726+
this._locale = this._localeId !== this._defaultLocale ? this._localeId : this._locale;
17271727
onResourceChangeHandle(this.destroy$, this.onResourceChange, this);
17281728
}
17291729

0 commit comments

Comments
 (0)