Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(i18n): Change advanced filtering cancel and apply buttons to start with capital letter #15171

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(i18n): Change advanced filtering cancel and apply buttons to start with capital letter #15171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd29a9d
fix(i18n): Cancel and Apply buttons to start with capital letter
mddragnev Dec 12, 2024
d756de6
chore(*): fix tests
mddragnev Dec 12, 2024
41e23d4
chore(*): fix tests
mddragnev Dec 13, 2024
53a39d6
chore(*): add missing toLowerCase
mddragnev Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ export const GridResourceStringsEN: IGridResourceStrings = {
igx_grid_excel_custom_dialog_add: 'add filter',
igx_grid_excel_custom_dialog_clear: 'Clear filter',
igx_grid_excel_custom_dialog_header: 'Custom auto-filter on column: ',
igx_grid_excel_cancel: 'cancel',
igx_grid_excel_apply: 'apply',
igx_grid_excel_cancel: 'Cancel',
igx_grid_excel_apply: 'Apply',
igx_grid_excel_search_placeholder: 'Search',
igx_grid_excel_select_all: 'Select All',
igx_grid_excel_select_all_search_results: 'Select all search results',
Expand Down
8 changes: 4 additions & 4 deletions projects/igniteui-angular/src/lib/test-utils/grid-functions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ export class GridFunctions {
public static getApplyButtonExcelStyleFiltering(fix: ComponentFixture<any>, menu = null, grid = 'igx-grid') {
const excelMenu = menu ? menu : GridFunctions.getExcelStyleFilteringComponent(fix, grid);
const containedButtons = Array.from(excelMenu.querySelectorAll('.igx-button--contained'));
const applyButton: any = containedButtons.find((rb: any) => rb.innerText === 'apply');
const applyButton: any = containedButtons.find((rb: any) => rb.innerText.toLowerCase() === 'apply');
return applyButton;
}

Expand All @@ -749,7 +749,7 @@ export class GridFunctions {
public static clickCancelExcelStyleFiltering(fix: ComponentFixture<any>, menu = null) {
const excelMenu = menu ? menu : GridFunctions.getExcelStyleFilteringComponent(fix);
const flatButtons = Array.from(excelMenu.querySelectorAll('.igx-button--flat'));
const cancelButton: any = flatButtons.find((rb: any) => rb.innerText === 'cancel');
const cancelButton: any = flatButtons.find((rb: any) => rb.innerText.toLowerCase() === 'cancel');
cancelButton.click();
}

Expand All @@ -770,7 +770,7 @@ export class GridFunctions {
public static getApplyExcelStyleCustomFiltering(fix: ComponentFixture<any>): HTMLElement {
const customFilterMenu = GridFunctions.getExcelStyleCustomFilteringDialog(fix);
const containedButtons = Array.from(customFilterMenu.querySelectorAll('.igx-button--contained'));
const applyButton = containedButtons.find((rb: any) => rb.innerText === 'apply');
const applyButton = containedButtons.find((rb: any) => rb.innerText.toLowerCase() === 'apply');
return applyButton as HTMLElement;
}

Expand Down Expand Up @@ -803,7 +803,7 @@ export class GridFunctions {
public static clickCancelExcelStyleCustomFiltering(fix: ComponentFixture<any>) {
const customFilterMenu = GridFunctions.getExcelStyleCustomFilteringDialog(fix);
const flatButtons = Array.from(customFilterMenu.querySelectorAll('.igx-button--flat'));
const cancelButton: any = flatButtons.find((rb: any) => rb.innerText === 'cancel');
const cancelButton: any = flatButtons.find((rb: any) => rb.innerText.toLowerCase() === 'cancel');
cancelButton.click();
}

Expand Down
Loading