Skip to content

Commit ab5c335

Browse files
RivaIvanovaRivaIvanova
authored
Merge branch 'master' into ganastasov/feat-14085-master
2 parents 4e821be + a1f3fe0 commit ab5c335

24 files changed

+89
-26
lines changed

‎projects/igniteui-angular-i18n/src/i18n/BG/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsBG_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Списъкът е празен'
5+
igx_combo_empty_message: 'Списъкът е празен',
6+
igx_combo_addCustomValues_placeholder: 'Добавяне на елемент',
7+
igx_combo_clearItems_placeholder: 'Изчистване на избора'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/CS/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsCS_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Seznam je prázdný'
5+
igx_combo_empty_message: 'Seznam je prázdný',
6+
igx_combo_addCustomValues_placeholder: 'Přidat položku',
7+
igx_combo_clearItems_placeholder: 'Vymazat výběr'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/DA/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsDA_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Listen er tom'
5+
igx_combo_empty_message: 'Listen er tom',
6+
igx_combo_addCustomValues_placeholder: 'Tilføj element',
7+
igx_combo_clearItems_placeholder: 'Ryd markering'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/DE/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsDE_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Die Liste ist leer'
5+
igx_combo_empty_message: 'Die Liste ist leer',
6+
igx_combo_addCustomValues_placeholder: 'Element hinzufügen',
7+
igx_combo_clearItems_placeholder: 'Auswahl löschen'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/ES/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsES_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'La lista está vacía'
5+
igx_combo_empty_message: 'La lista está vacía',
6+
igx_combo_addCustomValues_placeholder: 'Agregar elemento',
7+
igx_combo_clearItems_placeholder: 'Borrar selección'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/FR/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsFR_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'La liste est vide'
5+
igx_combo_empty_message: 'La liste est vide',
6+
igx_combo_addCustomValues_placeholder: 'Ajouter un élément',
7+
igx_combo_clearItems_placeholder: 'Effacer la sélection'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/HU/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsHU_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Üres a lista'
5+
igx_combo_empty_message: 'Üres a lista',
6+
igx_combo_addCustomValues_placeholder: 'Elem hozzáadása',
7+
igx_combo_clearItems_placeholder: 'Kiválasztás törlése'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/IT/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsIT_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'L\'elenco è vuoto'
5+
igx_combo_empty_message: 'L\'elenco è vuoto',
6+
igx_combo_addCustomValues_placeholder: 'Aggiungi elemento',
7+
igx_combo_clearItems_placeholder: 'Cancella selezione'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/JA/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsJA_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'リストが空です'
5+
igx_combo_empty_message: 'リストが空です',
6+
igx_combo_addCustomValues_placeholder: '項目の追加',
7+
igx_combo_clearItems_placeholder: '選択のクリア'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/KO/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsKO_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: '목록이 비어 있음'
5+
igx_combo_empty_message: '목록이 비어 있음',
6+
igx_combo_addCustomValues_placeholder: '항목 추가',
7+
igx_combo_clearItems_placeholder: '선택 지우기'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/NB/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsNB_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Listen er tom'
5+
igx_combo_empty_message: 'Listen er tom',
6+
igx_combo_addCustomValues_placeholder: 'Legg til element',
7+
igx_combo_clearItems_placeholder: 'Fjern valg'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/NL/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsNL_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'De lijst is leeg'
5+
igx_combo_empty_message: 'De lijst is leeg',
6+
igx_combo_addCustomValues_placeholder: 'Item toevoegen',
7+
igx_combo_clearItems_placeholder: 'Selectie wissen'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/PL/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsPL_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Lista jest pusta'
5+
igx_combo_empty_message: 'Lista jest pusta',
6+
igx_combo_addCustomValues_placeholder: 'Dodaj element',
7+
igx_combo_clearItems_placeholder: 'Wyczyść wybór'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/PT/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsPT_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'A lista está vazia'
5+
igx_combo_empty_message: 'A lista está vazia',
6+
igx_combo_addCustomValues_placeholder: 'Adicionar item',
7+
igx_combo_clearItems_placeholder: 'Limpar seleção'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/RO/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsRO_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Lista este goală'
5+
igx_combo_empty_message: 'Lista este goală',
6+
igx_combo_addCustomValues_placeholder: 'Adăugați element',
7+
igx_combo_clearItems_placeholder: 'Ștergeți selecția'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/SV/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsSV_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Listan är tom'
5+
igx_combo_empty_message: 'Listan är tom',
6+
igx_combo_addCustomValues_placeholder: 'Lägg till objekt',
7+
igx_combo_clearItems_placeholder: 'Rensa urval'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/TR/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsTR_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: 'Liste boş'
5+
igx_combo_empty_message: 'Liste boş',
6+
igx_combo_addCustomValues_placeholder: 'Öğe ekle',
7+
igx_combo_clearItems_placeholder: 'Seçimi temizle'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/ZH-HANS/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsZHHANS_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: '列表为空'
5+
igx_combo_empty_message: '列表为空',
6+
igx_combo_addCustomValues_placeholder: '添加项目',
7+
igx_combo_clearItems_placeholder: '清除选择'
68
};
79

810
/**

‎projects/igniteui-angular-i18n/src/i18n/ZH-HANT/combo-resources.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
22

33
// exported below as re-cast to create declaration type with expanded properties
44
const ComboResourceStringsZHHANT_: ExpandRequire<IComboResourceStrings> = {
5-
igx_combo_empty_message: '清單是空的'
5+
igx_combo_empty_message: '清單是空的',
6+
igx_combo_addCustomValues_placeholder: '新增項目',
7+
igx_combo_clearItems_placeholder: '清除選擇'
68
};
79

810
/**

‎projects/igniteui-angular/src/lib/combo/combo.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ng-container ngProjectAs="igx-suffix">
1818
<ng-content select="igx-suffix"></ng-content>
1919
</ng-container>
20-
<igx-suffix *ngIf="displayValue" aria-label="Clear Selection" class="igx-combo__clear-button"
20+
<igx-suffix *ngIf="displayValue" [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
2121
(click)="handleClearItems($event)">
2222
<ng-container *ngIf="clearIconTemplate">
2323
<ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
@@ -84,7 +84,7 @@
8484
</div>
8585
<igx-combo-add-item [itemHeight]="itemHeight" *ngIf="isAddButtonVisible()"
8686
[tabindex]="dropdown.collapsed ? -1 : customValueFlag ? 1 : -1" class="igx-combo__add-item" role="button"
87-
aria-label="Add Item" [index]="virtualScrollContainer.igxForOf.length">
87+
[attr.aria-label]="resourceStrings.igx_combo_addCustomValues_placeholder" [index]="virtualScrollContainer.igxForOf.length">
8888
<ng-container *ngTemplateOutlet="addItemTemplate ? addItemTemplate : addItemDefault">
8989
</ng-container>
9090
</igx-combo-add-item>
@@ -102,7 +102,7 @@
102102
<span>{{resourceStrings.igx_combo_empty_message}}</span>
103103
</ng-template>
104104
<ng-template #addItemDefault let-control>
105-
<button type="button" igxButton="flat" igxRipple>Add item</button>
105+
<button type="button" igxButton="flat" igxRipple>{{ resourceStrings.igx_combo_addCustomValues_placeholder }}</button>
106106
</ng-template>
107107
<ng-template #headerItemBase let-item let-key="valueKey" let-groupKey="groupKey">
108108
{{ item[key] }}

‎projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

+10
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,16 @@ describe('igxCombo', () => {
13561356

13571357
expect(errorSpy).not.toHaveBeenCalled();
13581358
});
1359+
it('should properly assign the resource string to the aria-label of the clear button',() => {
1360+
combo.toggle();
1361+
fixture.detectChanges();
1362+
1363+
combo.select(['Illinois', 'Mississippi', 'Ohio']);
1364+
fixture.detectChanges();
1365+
1366+
const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
1367+
expect(clearBtn.nativeElement.ariaLabel).toEqual('Clear Selection');
1368+
});
13591369
});
13601370
describe('Positioning tests: ', () => {
13611371
let containerElement: any;

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
export interface IComboResourceStrings {
22
igx_combo_empty_message?: string;
3+
igx_combo_addCustomValues_placeholder?: string;
4+
igx_combo_clearItems_placeholder?: string;
35
}
46

57
export const ComboResourceStringsEN: IComboResourceStrings = {
6-
igx_combo_empty_message: 'The list is empty'
8+
igx_combo_empty_message: 'The list is empty',
9+
igx_combo_addCustomValues_placeholder: 'Add Item',
10+
igx_combo_clearItems_placeholder: 'Clear Selection'
11+
712
};

‎projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<ng-content select="igx-suffix"></ng-content>
2525
</ng-container>
2626

27-
<igx-suffix *ngIf="hasSelectedItem" aria-label="Clear Selection" class="igx-combo__clear-button"
27+
<igx-suffix *ngIf="hasSelectedItem" [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
2828
(click)="handleClear($event)">
2929
<ng-container *ngIf="clearIconTemplate">
3030
<ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
@@ -86,7 +86,7 @@
8686
</div>
8787
<igx-combo-add-item #addItem [itemHeight]="itemHeight" *ngIf="isAddButtonVisible()"
8888
[tabindex]="dropdown.collapsed ? -1 : customValueFlag ? 1 : -1" class="igx-combo__add-item" role="button"
89-
aria-label="Add Item" [index]="virtualScrollContainer.igxForOf.length">
89+
[attr.aria-label]="resourceStrings.igx_combo_addCustomValues_placeholder" [index]="virtualScrollContainer.igxForOf.length">
9090
<ng-container *ngTemplateOutlet="addItemTemplate ? addItemTemplate : addItemDefault">
9191
</ng-container>
9292
</igx-combo-add-item>
@@ -105,7 +105,7 @@
105105
<span>{{resourceStrings.igx_combo_empty_message}}</span>
106106
</ng-template>
107107
<ng-template #addItemDefault let-control>
108-
<button type="button" igxButton="flat" igxRipple>Add item</button>
108+
<button type="button" igxButton="flat" igxRipple>{{ resourceStrings.igx_combo_addCustomValues_placeholder }}</button>
109109
</ng-template>
110110
<ng-template #headerItemBase let-item let-key="valueKey" let-groupKey="groupKey">
111111
{{ item[key] }}

‎projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts

+10
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,16 @@ describe('IgxSimpleCombo', () => {
944944
expect(clearButtonAfterEmptyObject).not.toBeNull();
945945
});
946946
}));
947+
it('should properly assign the resource string to the aria-label of the clear button',() => {
948+
combo.toggle();
949+
fixture.detectChanges();
950+
951+
combo.select(['Illinois', 'Mississippi', 'Ohio']);
952+
fixture.detectChanges();
953+
954+
const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
955+
expect(clearBtn.nativeElement.ariaLabel).toEqual('Clear Selection');
956+
});
947957
});
948958

949959
describe('Binding tests: ', () => {

0 commit comments

Comments
 (0)