Skip to content

Commit d916cfe

Browse files
authored
Merge branch '19.2.x' into mkirova/fix-15540-19.2.x
2 parents 35cfc42 + f7d45fc commit d916cfe

File tree

106 files changed

+2174
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2174
-598
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.1",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^17.2.0",
77+
"igniteui-theming": "^18.0.1",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.2",

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import { IgxGridToolbarComponent } from "../../../igniteui-angular/src/lib/grids
1414
import { IgxToolbarToken } from "../../../igniteui-angular/src/lib/grids/toolbar/token";
1515
import { IgxColumnComponent } from "../../../igniteui-angular/src/lib/grids/columns/column.component";
1616
import { IgxColumnGroupComponent } from "../../../igniteui-angular/src/lib/grids/columns/column-group.component";
17+
import { IgxColumnLayoutComponent } from "../../../igniteui-angular/src/lib/grids/columns/column-layout.component";
18+
import { IgxGridToolbarExporterComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-exporter.component";
19+
import { IgxGridToolbarHidingComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-hiding.component";
20+
import { IgxGridToolbarPinningComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-pinning.component";
1721
import { IgxRowIslandComponent } from "../../../igniteui-angular/src/lib/grids/hierarchical-grid/row-island.component";
1822
import { IgxActionStripComponent } from "../../../igniteui-angular/src/lib/action-strip/action-strip.component";
1923
import { IgxActionStripToken } from "../../../igniteui-angular/src/lib/action-strip/token";
2024
import { IgxGridEditingActionsComponent } from "../../../igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component";
2125
import { IgxGridActionsBaseDirective } from "../../../igniteui-angular/src/lib/action-strip/grid-actions/grid-actions-base.directive";
2226
import { IgxGridPinningActionsComponent } from "../../../igniteui-angular/src/lib/action-strip/grid-actions/grid-pinning-actions.component";
23-
import { IgxColumnLayoutComponent } from "../../../igniteui-angular/src/lib/grids/columns/column-layout.component";
24-
import { IgxGridToolbarExporterComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-exporter.component";
25-
import { IgxGridToolbarHidingComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-hiding.component";
26-
import { IgxGridToolbarPinningComponent } from "../../../igniteui-angular/src/lib/grids/toolbar/grid-toolbar-pinning.component";
2727
import { IgxGridStateComponent } from "../lib/state.component";
2828

2929
export const registerComponents = [

projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export const GridResourceStringsBG = {
5252
igx_grid_filter_false: 'False',
5353
igx_grid_filter_all: 'Всички',
5454
igx_grid_filter_condition_placeholder: 'Изберете филтър',
55+
igx_grid_filter_in: 'В/във',
56+
igx_grid_filter_notIn: 'Не е в/във',
5557
igx_grid_summary_count: 'Брой',
5658
igx_grid_summary_min: 'Минимално',
5759
igx_grid_summary_max: 'Максимално',
@@ -95,20 +97,32 @@ export const GridResourceStringsBG = {
9597
igx_grid_excel_no_matches: 'Няма съвпадения',
9698
igx_grid_excel_matches_count: '{0} съвпадения.',
9799
igx_grid_advanced_filter_title: 'Разширено филтриране',
100+
igx_grid_advanced_filter_from_label: 'От',
98101
igx_grid_advanced_filter_and_group: '"And" група',
99102
igx_grid_advanced_filter_or_group: '"Or" група',
100103
igx_grid_advanced_filter_end_group: 'Край на групирането',
101104
igx_grid_advanced_filter_create_and_group: 'Създай "And" група',
102105
igx_grid_advanced_filter_create_or_group: 'Създай "Or" група',
103106
igx_grid_advanced_filter_and_label: 'and',
104107
igx_grid_advanced_filter_or_label: 'or',
105-
igx_grid_advanced_filter_add_condition: 'Условие',
108+
igx_grid_advanced_filter_switch_group: 'Премини към {0}',
109+
igx_grid_advanced_filter_add_condition: 'Добави условие',
110+
igx_grid_advanced_filter_add_group: 'Добави група',
111+
igx_grid_advanced_filter_add_condition_root: 'Условие',
112+
igx_grid_advanced_filter_add_group_root: 'Група',
106113
igx_grid_advanced_filter_ungroup: 'Разгрупирай',
107114
igx_grid_advanced_filter_delete: 'Изтрий',
108115
igx_grid_advanced_filter_delete_filters: 'Изтрий филтрите',
109116
igx_grid_advanced_filter_initial_text: 'Започнете със създаване на група от условия свързани с "And" или "Or".',
110117
igx_grid_advanced_filter_column_placeholder: 'Избери колона',
111118
igx_grid_advanced_filter_value_placeholder: 'Стойност',
119+
igx_grid_advanced_filter_query_value_placeholder: 'Резултати от подзаявки',
120+
igx_grid_advanced_filter_select_entity: 'Избери обект',
121+
igx_grid_advanced_filter_select_return_field_single: 'Избери поле(та) за връщане',
122+
igx_grid_advanced_filter_dialog_title: 'Потвърждение',
123+
igx_grid_advanced_filter_dialog_message: 'С промяната на обекта ще загубите текущите си настройки. Сигурни ли сте, че искате да продължите?',
124+
igx_grid_advanced_filter_dialog_checkbox_text: 'Не показвай този диалогов прозорец отново',
125+
igx_grid_advanced_filter_drop_ghost_text: 'Постави тук за вмъкване',
112126
igx_grid_pinned_row_indicator: 'Закачени',
113127
igx_grid_hiding_check_all_label: 'Покажи всички',
114128
igx_grid_hiding_uncheck_all_label: 'Скрий всички',

projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export const GridResourceStringsCS = {
5252
igx_grid_filter_false: 'False',
5353
igx_grid_filter_all: 'Všechno',
5454
igx_grid_filter_condition_placeholder: 'Vyberte filtr',
55+
igx_grid_filter_in: 'V',
56+
igx_grid_filter_notIn: 'Není v',
5557
igx_grid_summary_count: 'Počet',
5658
igx_grid_summary_min: 'Min',
5759
igx_grid_summary_max: 'Max',
@@ -95,20 +97,32 @@ export const GridResourceStringsCS = {
9597
igx_grid_excel_no_matches: 'Žádné shody',
9698
igx_grid_excel_matches_count: 'Počet shod: {0}',
9799
igx_grid_advanced_filter_title: 'Pokročilé filtrování',
100+
igx_grid_advanced_filter_from_label: 'Z',
98101
igx_grid_advanced_filter_and_group: '"A" skupina',
99102
igx_grid_advanced_filter_or_group: '"Nebo" skupina',
100103
igx_grid_advanced_filter_end_group: 'Ukončit skupina',
101104
igx_grid_advanced_filter_create_and_group: 'Vytvořte skupinu "A"',
102105
igx_grid_advanced_filter_create_or_group: 'Vytvořte skupinu "Nebo"',
103106
igx_grid_advanced_filter_and_label: 'a',
104107
igx_grid_advanced_filter_or_label: 'nebo',
105-
igx_grid_advanced_filter_add_condition: 'Stav',
108+
igx_grid_advanced_filter_switch_group: 'Přepnout na {0}',
109+
igx_grid_advanced_filter_add_condition: 'Přidat podmínku',
110+
igx_grid_advanced_filter_add_group: 'Přidat skupinu',
111+
igx_grid_advanced_filter_add_condition_root: 'Podmínka:',
112+
igx_grid_advanced_filter_add_group_root: 'Skupina',
106113
igx_grid_advanced_filter_ungroup: 'Oddělit',
107114
igx_grid_advanced_filter_delete: 'Vymazat',
108115
igx_grid_advanced_filter_delete_filters: 'Smazat filtry',
109116
igx_grid_advanced_filter_initial_text: 'Začněte vytvořením skupiny podmínek spojených s "And" nebo "Or"',
110117
igx_grid_advanced_filter_column_placeholder: 'Vyberte sloupec',
111118
igx_grid_advanced_filter_value_placeholder: 'Hodnota',
119+
igx_grid_advanced_filter_query_value_placeholder: 'Výsledky dílčího dotazu',
120+
igx_grid_advanced_filter_select_entity: 'Vyberte pole pro vrácení',
121+
igx_grid_advanced_filter_select_return_field_single: 'Vyberte pole pro vrácení',
122+
igx_grid_advanced_filter_dialog_title: 'Potvrzení',
123+
igx_grid_advanced_filter_dialog_message: 'Změnou entity ztratíte svá aktuální nastavení. Opravdu to chcete udělat?',
124+
igx_grid_advanced_filter_dialog_checkbox_text: 'Tento dialog již příště nezobrazovat',
125+
igx_grid_advanced_filter_drop_ghost_text: 'Přetažením sem vložíte',
112126
igx_grid_pinned_row_indicator: 'Připnuto',
113127
igx_grid_hiding_check_all_label: 'Ukázat vše',
114128
igx_grid_hiding_uncheck_all_label: 'Skrýt vše',

projects/igniteui-angular-i18n/src/i18n/CS/query-builder-resources.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export const QueryBuilderResourceStringsCS = {
5151
igx_query_builder_and_label: 'a',
5252
igx_query_builder_or_label: 'nebo',
5353
igx_query_builder_switch_group: 'Přepnout na {0}',
54-
igx_query_builder_add_condition: 'Vytvořte stav',
55-
igx_query_builder_add_group: 'Vytvořte skupina',
56-
igx_query_builder_add_condition_root: 'Stav',
54+
igx_query_builder_add_condition: 'Vytvořte podmínku',
55+
igx_query_builder_add_group: 'Vytvořte skupinu',
56+
igx_query_builder_add_condition_root: 'Podmínka',
5757
igx_query_builder_add_group_root: 'Skupina',
5858
igx_query_builder_ungroup: 'Oddělit',
5959
igx_query_builder_delete: 'Vymazat',

projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export const GridResourceStringsDA = {
5252
igx_grid_filter_false: 'False',
5353
igx_grid_filter_all: 'Alle',
5454
igx_grid_filter_condition_placeholder: 'Vælg filter',
55+
igx_grid_filter_in: 'I',
56+
igx_grid_filter_notIn: 'Ikke i',
5557
igx_grid_summary_count: 'Optælling',
5658
igx_grid_summary_min: 'Min',
5759
igx_grid_summary_max: 'Maks',
@@ -95,20 +97,32 @@ export const GridResourceStringsDA = {
9597
igx_grid_excel_no_matches: 'Ingen forekomster',
9698
igx_grid_excel_matches_count: '{0} forekomster',
9799
igx_grid_advanced_filter_title: 'Avanceret filtrering',
100+
igx_grid_advanced_filter_from_label: 'Fra',
98101
igx_grid_advanced_filter_and_group: '"Og" gruppe',
99102
igx_grid_advanced_filter_or_group: '"Eller" gruppe',
100103
igx_grid_advanced_filter_end_group: 'Afslut gruppe',
101104
igx_grid_advanced_filter_create_and_group: 'Opret "Og" gruppe',
102105
igx_grid_advanced_filter_create_or_group: 'Opret "Eller" gruppe',
103106
igx_grid_advanced_filter_and_label: 'og',
104107
igx_grid_advanced_filter_or_label: 'eller',
105-
igx_grid_advanced_filter_add_condition: 'Tilstand',
108+
igx_grid_advanced_filter_switch_group: 'Skift til {0}',
109+
igx_grid_advanced_filter_add_condition: 'Tilføj betingelse',
110+
igx_grid_advanced_filter_add_group: 'Tilføj gruppe',
111+
igx_grid_advanced_filter_add_condition_root: 'Betingelse',
112+
igx_grid_advanced_filter_add_group_root: 'Gruppe',
106113
igx_grid_advanced_filter_ungroup: 'Fjern gruppe',
107114
igx_grid_advanced_filter_delete: 'Slet',
108115
igx_grid_advanced_filter_delete_filters: 'Slet filtre',
109116
igx_grid_advanced_filter_initial_text: 'Start med at oprette en tilstandsgruppe, der er knyttet til "Og" eller "Eller"',
110117
igx_grid_advanced_filter_column_placeholder: 'Vælg kolonne',
111118
igx_grid_advanced_filter_value_placeholder: 'Værdi',
119+
igx_grid_advanced_filter_query_value_placeholder: 'Underforespørgselsresultater',
120+
igx_grid_advanced_filter_select_entity: 'Vælg objekt',
121+
igx_grid_advanced_filter_select_return_field_single: 'Vælg returfelt',
122+
igx_grid_advanced_filter_dialog_title: 'Bekræftelse',
123+
igx_grid_advanced_filter_dialog_message: 'Ved at ændre objektet mister du dine nuværende indstillinger. Er du sikker på, at du vil fortsætte?',
124+
igx_grid_advanced_filter_dialog_checkbox_text: 'Vis ikke denne dialogboks igen',
125+
igx_grid_advanced_filter_drop_ghost_text: 'Slip her for at indsætte',
112126
igx_grid_pinned_row_indicator: 'Fastgjort',
113127
igx_grid_hiding_check_all_label: 'Vis alt',
114128
igx_grid_hiding_uncheck_all_label: 'Gem alt',

projects/igniteui-angular-i18n/src/i18n/DA/query-builder-resources.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export const QueryBuilderResourceStringsDA = {
5151
igx_query_builder_and_label: 'og',
5252
igx_query_builder_or_label: 'eller',
5353
igx_query_builder_switch_group: 'Skift til {0}',
54-
igx_query_builder_add_condition: 'Opret tilstand',
54+
igx_query_builder_add_condition: 'Opret betingelse',
5555
igx_query_builder_add_group: 'Opret gruppe',
56-
igx_query_builder_add_condition_root: 'Tilstand',
56+
igx_query_builder_add_condition_root: 'Betingelse',
5757
igx_query_builder_add_group_root: 'Gruppe',
5858
igx_query_builder_ungroup: 'Fjern gruppe',
5959
igx_query_builder_delete: 'Slet',

projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ export const GridResourceStringsDE = {
5050
igx_grid_filter_false: 'Falsch',
5151
igx_grid_filter_all: 'Alle',
5252
igx_grid_filter_condition_placeholder: 'Wähle Filter',
53+
igx_grid_filter_in: 'In',
54+
igx_grid_filter_notIn: 'Nicht in',
5355
igx_grid_summary_count: 'Anzahl',
5456
igx_grid_summary_min: 'Min',
5557
igx_grid_summary_max: 'Max',
@@ -93,20 +95,32 @@ export const GridResourceStringsDE = {
9395
igx_grid_excel_no_matches: 'Keine Übereinstimmungen',
9496
igx_grid_excel_matches_count: '{0} Übereinstimmungen',
9597
igx_grid_advanced_filter_title: 'Erweiterte Filterung',
98+
igx_grid_advanced_filter_from_label: 'Von',
9699
igx_grid_advanced_filter_and_group: '"Und" Gruppe',
97100
igx_grid_advanced_filter_or_group: '"Oder" Gruppe',
98101
igx_grid_advanced_filter_end_group: 'Beende Gruppe',
99102
igx_grid_advanced_filter_create_and_group: 'Erstelle "Und" Gruppe',
100103
igx_grid_advanced_filter_create_or_group: 'Erstelle "Oder" Gruppe',
101104
igx_grid_advanced_filter_and_label: 'und',
102105
igx_grid_advanced_filter_or_label: 'oder',
103-
igx_grid_advanced_filter_add_condition: 'Bedingung',
106+
igx_grid_advanced_filter_switch_group: 'Wechseln zu {0}',
107+
igx_grid_advanced_filter_add_condition: 'Bedingung hinzufügen',
108+
igx_grid_advanced_filter_add_group: 'Gruppe hinzufügen',
109+
igx_grid_advanced_filter_add_condition_root: 'Bedingung',
110+
igx_grid_advanced_filter_add_group_root: 'Gruppe',
104111
igx_grid_advanced_filter_ungroup: 'Lösche Gruppierung',
105112
igx_grid_advanced_filter_delete: 'Lösche',
106113
igx_grid_advanced_filter_delete_filters: 'Lösche Filter',
107114
igx_grid_advanced_filter_initial_text: 'Fange an mit einer Gruppe von Bedingungen, die mit "Und" oder "Oder" verknüpft sind',
108115
igx_grid_advanced_filter_column_placeholder: 'Wähle Spalte',
109116
igx_grid_advanced_filter_value_placeholder: 'Wert',
117+
igx_grid_advanced_filter_query_value_placeholder: 'Unterabfrageergebnisse',
118+
igx_grid_advanced_filter_select_entity: 'Entität auswählen',
119+
igx_grid_advanced_filter_select_return_field_single: 'Rückgabefeld auswählen',
120+
igx_grid_advanced_filter_dialog_title: 'Bestätigung',
121+
igx_grid_advanced_filter_dialog_message: 'Durch das Ändern der Entität gehen Ihre aktuellen Einstellungen verloren. Möchten Sie wirklich fortfahren?',
122+
igx_grid_advanced_filter_dialog_checkbox_text: 'Dieses Dialogfeld nicht mehr anzeigen',
123+
igx_grid_advanced_filter_drop_ghost_text: 'Hier ablegen, um einzufügen',
110124
igx_grid_pinned_row_indicator: 'Fixiert',
111125
igx_grid_hiding_check_all_label: 'Zeige alle',
112126
igx_grid_hiding_uncheck_all_label: 'Verstecke alle',

projects/igniteui-angular-i18n/src/i18n/DE/query-builder-resources.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export const QueryBuilderResourceStringsDE = {
5151
igx_query_builder_and_label: 'und',
5252
igx_query_builder_or_label: 'oder',
5353
igx_query_builder_switch_group: 'Wechseln zu {0}',
54-
igx_query_builder_add_condition: 'Erstelle bedingung',
55-
igx_query_builder_add_group: 'Erstelle gruppe',
54+
igx_query_builder_add_condition: 'Bedingung erstellen',
55+
igx_query_builder_add_group: 'Gruppe erstellen',
5656
igx_query_builder_add_condition_root: 'Bedingung',
5757
igx_query_builder_add_group_root: 'Gruppe',
5858
igx_query_builder_ungroup: 'Lösche Gruppierung',

0 commit comments

Comments
 (0)