Skip to content

Commit 2a63192

Browse files
committed
fix(query-builder): Fix resource strings not inherited from grid and down further.
1 parent 0af39a3 commit 2a63192

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<igx-query-builder #queryBuilder
99
[locale]="grid.locale"
1010
[entities]="generateEntity()"
11+
[resourceStrings]="queryBuilderResourceStrings"
1112
[expressionTree]="this.grid.advancedFilteringExpressionsTree">
1213
<igx-query-builder-header
1314
[title]="grid.resourceStrings.igx_grid_advanced_filter_title"

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { IgxButtonDirective } from '../../../directives/button/button.directive'
1414
import { IgxQueryBuilderHeaderComponent } from '../../../query-builder/query-builder-header.component';
1515
import { NgClass } from '@angular/common';
1616
import { getCurrentResourceStrings } from '../../../core/i18n/resources';
17-
import { QueryBuilderResourceStringsEN } from '../../../core/i18n/query-builder-resources';
17+
import { IQueryBuilderResourceStrings, QueryBuilderResourceStringsEN } from '../../../core/i18n/query-builder-resources';
1818
import { IgxHierarchicalGridComponent } from '../../hierarchical-grid/hierarchical-grid.component';
1919

2020
/**
@@ -56,6 +56,11 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
5656
*/
5757
public lastActiveNode = {} as IActiveNode;
5858

59+
/**
60+
* @hidden @internal
61+
*/
62+
public queryBuilderResourceStrings: IQueryBuilderResourceStrings;
63+
5964
private destroy$ = new Subject<any>();
6065
private _overlayComponentId: string;
6166
private _overlayService: IgxOverlayService;
@@ -229,7 +234,6 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
229234
// If grid has custom resource strings set for the advanced filtering,
230235
// they are passed to the query builder resource strings.
231236
const gridRS = this.grid.resourceStrings;
232-
233237
if (gridRS !== GridResourceStringsEN) {
234238
const queryBuilderRS = getCurrentResourceStrings(QueryBuilderResourceStringsEN, init);
235239
Object.keys(gridRS).forEach((prop) => {
@@ -246,6 +250,8 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
246250
queryBuilderRS[generalProp] = gridRS[prop];
247251
}
248252
});
253+
254+
this.queryBuilderResourceStrings = queryBuilderRS;
249255
}
250256
}
251257
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
[expectedReturnField]="this.selectedField?.field"
473473
[expressionTree]="expressionItem.inEditMode ? (innerQueryNewExpressionTree ?? getExpressionTreeCopy(expressionItem.expression.searchTree, true)) : expressionItem.expression.searchTree"
474474
(inEditModeChange)="onInEditModeChanged($event)"
475-
[searchValueTemplate]="searchValueTemplate">
475+
[searchValueTemplate]="searchValueTemplate"
476+
[resourceStrings]="resourceStrings">
476477
</igx-query-builder-tree>
477478
</ng-container>
478479
}

0 commit comments

Comments
 (0)