Skip to content

Commit ac694ae

Browse files
committed
feat(localization): Apply new localization to query builder and excel style filtering.
1 parent 9ef4fa0 commit ac694ae

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Component, Input, ViewChild } from '@angular/core';
22
import { IgxExcelStyleDefaultExpressionComponent } from './excel-style-default-expression.component';
33
import { IgxInputDirective } from '../../../directives/input/input.directive';
44
import { IgxTimePickerComponent } from '../../../time-picker/time-picker.component';
5-
import { getLocaleFirstDayOfWeek } from "@angular/common";
65
import { IgxOverlayOutletDirective } from '../../../directives/toggle/toggle.directive';
76
import { IgxButtonGroupComponent } from '../../../buttonGroup/buttonGroup.component';
87
import { IgxButtonDirective } from '../../../directives/button/button.directive';
@@ -16,6 +15,7 @@ import { IgxIconComponent } from '../../../icon/icon.component';
1615
import { IgxPrefixDirective } from '../../../directives/prefix/prefix.directive';
1716
import { IgxSelectComponent } from '../../../select/select.component';
1817
import { IgxIconButtonDirective } from '../../../directives/button/icon-button.directive';
18+
import { getLocaleFirstDayOfWeek } from '../../../core/utils';
1919

2020
/**
2121
* @hidden

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Output,
66
TemplateRef
77
} from '@angular/core';
8-
import { getLocaleFirstDayOfWeek, NgTemplateOutlet, NgClass, DatePipe } from '@angular/common';
8+
import { NgTemplateOutlet, NgClass, DatePipe } from '@angular/common';
99
import { Inject } from '@angular/core';
1010
import {
1111
Component, Input, ViewChild, ChangeDetectorRef, ViewChildren, QueryList, ElementRef, OnDestroy, HostBinding
@@ -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 { getCurrentResourceStrings, initi18n } 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';
@@ -55,7 +55,7 @@ import { IgxDropDownItemNavigationDirective } from '../drop-down/drop-down-navig
5555
import { IgxQueryBuilderDragService } from './query-builder-drag.service';
5656
import { isTree } from '../data-operations/expressions-tree-util';
5757
import { ExpressionGroupItem, ExpressionItem, ExpressionOperandItem, IgxFieldFormatterPipe } from './query-builder.common';
58-
import { getI18nManager } from 'igniteui-i18n-core';
58+
import { getCurrentI18n, getI18nManager } from 'igniteui-i18n-core';
5959

6060
const DEFAULT_PIPE_DATE_FORMAT = 'mediumDate';
6161
const DEFAULT_PIPE_TIME_FORMAT = 'mediumTime';
@@ -219,12 +219,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
219219
*/
220220
public set locale(value: string) {
221221
this._locale = value;
222-
// if value is invalid, set it back to _localeId
223-
try {
224-
getLocaleFirstDayOfWeek(this._locale);
225-
} catch {
226-
this._locale = this._localeId;
227-
}
228222
}
229223

230224
/**
@@ -546,7 +540,8 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
546540
protected platform: PlatformUtil,
547541
private elRef: ElementRef,
548542
@Inject(LOCALE_ID) protected _localeId: string) {
549-
this.locale = this.locale || this._localeId;
543+
initi18n(_localeId);
544+
this.locale = this.locale || getCurrentI18n();
550545
this.dragService.register(this, elRef);
551546
getI18nManager().onResourceChange(() => {
552547
this._resourceStrings = getCurrentResourceStrings(QueryBuilderResourceStringsEN, false);

0 commit comments

Comments
 (0)