Merge branch '17.2.x' into ganastasov/fix-14650-17.2.x

georgianastasov · web-flow · commit 90c5159f3c71 · 2024-09-10T09:57:07.000+03:00
diff --git a/projects/igniteui-angular-i18n/src/i18n/BG/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/BG/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsBG_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Списъкът е празен'
+    igx_combo_empty_message: 'Списъкът е празен',
+    igx_combo_addCustomValues_placeholder: 'Добавяне на елемент',
+    igx_combo_clearItems_placeholder: 'Изчистване на избора'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/CS/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/CS/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsCS_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Seznam je prázdný'
+    igx_combo_empty_message: 'Seznam je prázdný',
+    igx_combo_addCustomValues_placeholder: 'Přidat položku',
+    igx_combo_clearItems_placeholder: 'Vymazat výběr'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DA/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DA/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsDA_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Listen er tom'
+    igx_combo_empty_message: 'Listen er tom',
+    igx_combo_addCustomValues_placeholder: 'Tilføj element',
+    igx_combo_clearItems_placeholder: 'Ryd markering'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DE/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DE/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsDE_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Die Liste ist leer'
+    igx_combo_empty_message: 'Die Liste ist leer',
+    igx_combo_addCustomValues_placeholder: 'Element hinzufügen',
+    igx_combo_clearItems_placeholder: 'Auswahl löschen'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ES/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ES/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsES_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'La lista está vacía'
+    igx_combo_empty_message: 'La lista está vacía',
+    igx_combo_addCustomValues_placeholder: 'Agregar elemento',
+    igx_combo_clearItems_placeholder: 'Borrar selección'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/FR/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/FR/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsFR_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'La liste est vide'
+    igx_combo_empty_message: 'La liste est vide',
+    igx_combo_addCustomValues_placeholder: 'Ajouter un élément',
+    igx_combo_clearItems_placeholder: 'Effacer la sélection'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/HU/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/HU/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsHU_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Üres a lista'
+    igx_combo_empty_message: 'Üres a lista',
+    igx_combo_addCustomValues_placeholder: 'Elem hozzáadása',
+    igx_combo_clearItems_placeholder: 'Kiválasztás törlése'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/IT/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/IT/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsIT_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'L\'elenco è vuoto'
+    igx_combo_empty_message: 'L\'elenco è vuoto',
+    igx_combo_addCustomValues_placeholder: 'Aggiungi elemento',
+    igx_combo_clearItems_placeholder: 'Cancella selezione'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/JA/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/JA/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsJA_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'リストが空です'
+    igx_combo_empty_message: 'リストが空です',
+    igx_combo_addCustomValues_placeholder: '項目の追加',
+    igx_combo_clearItems_placeholder: '選択のクリア'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/KO/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/KO/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsKO_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: '목록이 비어 있음'
+    igx_combo_empty_message: '목록이 비어 있음',
+    igx_combo_addCustomValues_placeholder: '항목 추가',
+    igx_combo_clearItems_placeholder: '선택 지우기'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/NB/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NB/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsNB_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Listen er tom'
+    igx_combo_empty_message: 'Listen er tom',
+    igx_combo_addCustomValues_placeholder: 'Legg til element',
+    igx_combo_clearItems_placeholder: 'Fjern valg'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/NL/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NL/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsNL_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'De lijst is leeg'
+    igx_combo_empty_message: 'De lijst is leeg',
+    igx_combo_addCustomValues_placeholder: 'Item toevoegen',
+    igx_combo_clearItems_placeholder: 'Selectie wissen'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PL/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PL/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsPL_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Lista jest pusta'
+    igx_combo_empty_message: 'Lista jest pusta',
+    igx_combo_addCustomValues_placeholder: 'Dodaj element',
+    igx_combo_clearItems_placeholder: 'Wyczyść wybór'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PT/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PT/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsPT_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'A lista está vazia'
+    igx_combo_empty_message: 'A lista está vazia',
+    igx_combo_addCustomValues_placeholder: 'Adicionar item',
+    igx_combo_clearItems_placeholder: 'Limpar seleção'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/RO/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/RO/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsRO_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Lista este goală'
+    igx_combo_empty_message: 'Lista este goală',
+    igx_combo_addCustomValues_placeholder: 'Adăugați element',
+    igx_combo_clearItems_placeholder: 'Ștergeți selecția'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/SV/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/SV/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsSV_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Listan är tom'
+    igx_combo_empty_message: 'Listan är tom',
+    igx_combo_addCustomValues_placeholder: 'Lägg till objekt',
+    igx_combo_clearItems_placeholder: 'Rensa urval'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/TR/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/TR/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsTR_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: 'Liste boş'
+    igx_combo_empty_message: 'Liste boş',
+    igx_combo_addCustomValues_placeholder: 'Öğe ekle',
+    igx_combo_clearItems_placeholder: 'Seçimi temizle'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsZHHANS_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: '列表为空'
+    igx_combo_empty_message: '列表为空',
+    igx_combo_addCustomValues_placeholder: '添加项目',
+    igx_combo_clearItems_placeholder: '清除选择'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/combo-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/combo-resources.ts
@@ -2,7 +2,9 @@ import { IComboResourceStrings } from 'igniteui-angular';
 
 // exported below as re-cast to create declaration type with expanded properties
 const ComboResourceStringsZHHANT_: ExpandRequire<IComboResourceStrings> = {
-    igx_combo_empty_message: '清單是空的'
+    igx_combo_empty_message: '清單是空的',
+    igx_combo_addCustomValues_placeholder: '新增項目',
+    igx_combo_clearItems_placeholder: '清除選擇'
 };
 
 /**
diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.html b/projects/igniteui-angular/src/lib/combo/combo.component.html
@@ -17,7 +17,7 @@
     <ng-container ngProjectAs="igx-suffix">
         <ng-content select="igx-suffix"></ng-content>
     </ng-container>
-    <igx-suffix *ngIf="displayValue" aria-label="Clear Selection" class="igx-combo__clear-button"
+    <igx-suffix *ngIf="displayValue" [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
         (click)="handleClearItems($event)">
         <ng-container *ngIf="clearIconTemplate">
             <ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
@@ -84,7 +84,7 @@
         </div>
         <igx-combo-add-item [itemHeight]="itemHeight" *ngIf="isAddButtonVisible()"
             [tabindex]="dropdown.collapsed ? -1 : customValueFlag ? 1 : -1" class="igx-combo__add-item" role="button"
-            aria-label="Add Item" [index]="virtualScrollContainer.igxForOf.length">
+            [attr.aria-label]="resourceStrings.igx_combo_addCustomValues_placeholder" [index]="virtualScrollContainer.igxForOf.length">
             <ng-container *ngTemplateOutlet="addItemTemplate ? addItemTemplate : addItemDefault">
             </ng-container>
         </igx-combo-add-item>
@@ -102,7 +102,7 @@
     <span>{{resourceStrings.igx_combo_empty_message}}</span>
 </ng-template>
 <ng-template #addItemDefault let-control>
-    <button type="button" igxButton="flat" igxRipple>Add item</button>
+    <button type="button" igxButton="flat" igxRipple>{{ resourceStrings.igx_combo_addCustomValues_placeholder }}</button>
 </ng-template>
 <ng-template #headerItemBase let-item let-key="valueKey" let-groupKey="groupKey">
     {{ item[key] }}
diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts b/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts
@@ -1169,6 +1169,16 @@ describe('igxCombo', () => {
 
                 expect(errorSpy).not.toHaveBeenCalled();
             });
+            it('should properly assign the resource string to the aria-label of the clear button',() => {
+                combo.toggle();
+                fixture.detectChanges();
+
+                combo.select(['Illinois', 'Mississippi', 'Ohio']);
+                fixture.detectChanges();
+
+                const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
+                expect(clearBtn.nativeElement.ariaLabel).toEqual('Clear Selection');
+            });
         });
         describe('Positioning tests: ', () => {
             let containerElement: any;
diff --git a/projects/igniteui-angular/src/lib/core/i18n/combo-resources.ts b/projects/igniteui-angular/src/lib/core/i18n/combo-resources.ts
@@ -1,7 +1,12 @@
 export interface IComboResourceStrings {
     igx_combo_empty_message?: string;
+    igx_combo_addCustomValues_placeholder?: string;
+    igx_combo_clearItems_placeholder?: string;
 }
 
 export const ComboResourceStringsEN: IComboResourceStrings = {
-    igx_combo_empty_message: 'The list is empty'
+    igx_combo_empty_message: 'The list is empty',
+    igx_combo_addCustomValues_placeholder: 'Add Item',
+    igx_combo_clearItems_placeholder: 'Clear Selection'
+
 };
diff --git a/projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.html b/projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.html
@@ -24,7 +24,7 @@
         <ng-content select="igx-suffix"></ng-content>
     </ng-container>
 
-    <igx-suffix *ngIf="hasSelectedItem" aria-label="Clear Selection" class="igx-combo__clear-button"
+    <igx-suffix *ngIf="hasSelectedItem" [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
         (click)="handleClear($event)">
         <ng-container *ngIf="clearIconTemplate">
             <ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
@@ -90,7 +90,7 @@
         </div>
         <igx-combo-add-item #addItem [itemHeight]="itemHeight" *ngIf="isAddButtonVisible()"
             [tabindex]="dropdown.collapsed ? -1 : customValueFlag ? 1 : -1" class="igx-combo__add-item" role="button"
-            aria-label="Add Item" [index]="virtualScrollContainer.igxForOf.length">
+            [attr.aria-label]="resourceStrings.igx_combo_addCustomValues_placeholder" [index]="virtualScrollContainer.igxForOf.length">
             <ng-container *ngTemplateOutlet="addItemTemplate ? addItemTemplate : addItemDefault">
             </ng-container>
         </igx-combo-add-item>
@@ -109,7 +109,7 @@
     <span>{{resourceStrings.igx_combo_empty_message}}</span>
 </ng-template>
 <ng-template #addItemDefault let-control>
-    <button type="button" igxButton="flat" igxRipple>Add item</button>
+    <button type="button" igxButton="flat" igxRipple>{{ resourceStrings.igx_combo_addCustomValues_placeholder }}</button>
 </ng-template>
 <ng-template #headerItemBase let-item let-key="valueKey" let-groupKey="groupKey">
     {{ item[key] }}
diff --git a/projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts b/projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts
@@ -828,6 +828,16 @@ describe('IgxSimpleCombo', () => {
                 expect(clearButtonAfterEmptyObject).not.toBeNull();
             });
         }));
+        it('should properly assign the resource string to the aria-label of the clear button',() => {
+            combo.toggle();
+            fixture.detectChanges();
+
+            combo.select(['Illinois', 'Mississippi', 'Ohio']);
+            fixture.detectChanges();
+
+            const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
+            expect(clearBtn.nativeElement.ariaLabel).toEqual('Clear Selection');
+        });
     });
 
     describe('Binding tests: ', () => {
