Skip to content

Commit 6fac7b3

Browse files
committed
fix(locale): Fix initial component locale comming from Angular overriding.
1 parent c02aa83 commit 6fac7b3

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
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 } from '../core/i18n/resources';
9+
import { DEFAULT_LOCALE, getCurrentResourceStrings } from '../core/i18n/resources';
1010
import { KeyboardNavigationService } from './calendar.services';
1111
import { getYearRange, isDateInRanges } from './common/helpers';
1212
import { CalendarDay } from './common/model';
@@ -1020,7 +1020,7 @@ export class IgxCalendarBaseDirective implements ControlValueAccessor {
10201020

10211021
private initLocale() {
10221022
this._defaultLocale = getCurrentI18n();
1023-
this._locale = this._localeId !== this._defaultLocale ? this._localeId : this._locale;
1023+
this._locale = this._localeId !== DEFAULT_LOCALE ? 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import {
2020
getI18nManager
2121
} from 'igniteui-i18n-core';
2222

23+
export const DEFAULT_LOCALE = 'en-US';
24+
2325
export interface IResourceStrings extends IGridResourceStrings, ITimePickerResourceStrings, ICalendarResourceStrings,
2426
ICarouselResourceStrings, IChipResourceStrings, IComboResourceStrings, IInputResourceStrings, IDatePickerResourceStrings,
2527
IDateRangePickerResourceStrings, IListResourceStrings, IPaginatorResourceStrings, ITreeResourceStrings,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ 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 { DEFAULT_LOCALE } from '../core/i18n/resources';
2324

2425
@Directive()
2526
export abstract class PickerBaseDirective implements IToggleView, EditorProvider, AfterViewInit, AfterContentChecked, OnDestroy {
@@ -361,7 +362,7 @@ export abstract class PickerBaseDirective implements IToggleView, EditorProvider
361362

362363
protected initLocale() {
363364
this._defaultLocale = getCurrentI18n();
364-
this._locale = this._localeId !== this._defaultLocale ? this._localeId : this._locale;
365+
this._locale = this._localeId !== DEFAULT_LOCALE ? this._localeId : this._locale;
365366
}
366367

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

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 } from '../core/i18n/resources';
184+
import { DEFAULT_LOCALE, 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';
@@ -8282,7 +8282,7 @@ export abstract class IgxGridBaseDirective implements GridType,
82828282

82838283
private initLocale() {
82848284
this._defaultLocale = getCurrentI18n();
8285-
this._locale = this.localeId !== this._defaultLocale ? this.localeId : this._locale;
8285+
this._locale = this.localeId !== DEFAULT_LOCALE ? 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 } from '../core/i18n/resources';
39+
import { DEFAULT_LOCALE, 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';
@@ -1723,7 +1723,7 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
17231723

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

0 commit comments

Comments
 (0)