chore(dateRange): Resolving merge conflicts

Ivan Kitanov · Ivan Kitanov · commit c94bc0527658 · 2025-08-20T17:29:29.000+03:00
diff --git a/projects/igniteui-angular-i18n/src/i18n/BG/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/BG/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsBG = {
     igx_date_range_picker_date_separator: 'до',
     igx_date_range_picker_done_button: 'Завърши',
-    igx_date_range_picker_cancel_button: 'Отмени'
+    igx_date_range_picker_cancel_button: 'Отмени',
     igx_date_range_picker_last7Days: 'Последните 7 дни',
     igx_date_range_picker_currentMonth: 'Текущ месец',
     igx_date_range_picker_last30Days: 'Последните 30 дни',
diff --git a/projects/igniteui-angular-i18n/src/i18n/CS/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/CS/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsCS = {
     igx_date_range_picker_date_separator: 'na',
     igx_date_range_picker_done_button: 'Hotovo',
-    igx_date_range_picker_cancel_button: 'Zrušit'
+    igx_date_range_picker_cancel_button: 'Zrušit',
     igx_date_range_picker_last7Days: 'Posledních 7 dní',
     igx_date_range_picker_currentMonth: 'Tento měsíc',
     igx_date_range_picker_last30Days: 'Posledních 30 dní',
diff --git a/projects/igniteui-angular-i18n/src/i18n/DA/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DA/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsDA = {
     igx_date_range_picker_date_separator: 'till',
     igx_date_range_picker_done_button: 'Færdigt',
-    igx_date_range_picker_cancel_button: 'Annuller'
+    igx_date_range_picker_cancel_button: 'Annuller',
     igx_date_range_picker_last7Days: 'Sidste 7 dage',
     igx_date_range_picker_currentMonth: 'Denne måned',
     igx_date_range_picker_last30Days: 'Sidste 30 dage',
diff --git a/projects/igniteui-angular-i18n/src/i18n/DE/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DE/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsDE = {
     igx_date_range_picker_date_separator: 'bis',
     igx_date_range_picker_done_button: 'Fertig',
-    igx_date_range_picker_cancel_button: 'Abbrechen'
+    igx_date_range_picker_cancel_button: 'Abbrechen',
     igx_date_range_picker_last7Days: 'Letzte 7 Tage',
     igx_date_range_picker_currentMonth: 'Aktueller Monat',
     igx_date_range_picker_last30Days: 'Letzte 30 Tage',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ES/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ES/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsES = {
     igx_date_range_picker_date_separator: 'a',
     igx_date_range_picker_done_button: 'Listo',
-    igx_date_range_picker_cancel_button: 'Cancelar'
+    igx_date_range_picker_cancel_button: 'Cancelar',
     igx_date_range_picker_last7Days: 'Últimos 7 días',
     igx_date_range_picker_currentMonth: 'Mes actual',
     igx_date_range_picker_last30Days: 'Últimos 30 días',
diff --git a/projects/igniteui-angular-i18n/src/i18n/FR/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/FR/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsFR = {
     igx_date_range_picker_date_separator: 'à',
     igx_date_range_picker_done_button: 'Terminée',
-    igx_date_range_picker_cancel_button: 'Annuler'
+    igx_date_range_picker_cancel_button: 'Annuler',
     igx_date_range_picker_last7Days: '7 derniers jours',
     igx_date_range_picker_currentMonth: 'Mois en cours',
     igx_date_range_picker_last30Days: '30 derniers jours',
diff --git a/projects/igniteui-angular-i18n/src/i18n/HU/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/HU/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsHU = {
     igx_date_range_picker_date_separator: '-',
     igx_date_range_picker_done_button: 'Kész',
-    igx_date_range_picker_cancel_button: 'Mégse'
+    igx_date_range_picker_cancel_button: 'Mégse',
     igx_date_range_picker_last7Days: 'Az elmúlt 7 nap',
     igx_date_range_picker_currentMonth: 'Aktuális hónap',
     igx_date_range_picker_last30Days: 'Az elmúlt 30 nap',
diff --git a/projects/igniteui-angular-i18n/src/i18n/IT/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/IT/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsIT = {
     igx_date_range_picker_date_separator: 'a',
     igx_date_range_picker_done_button: 'Fine',
-    igx_date_range_picker_cancel_button: 'Annulla'
+    igx_date_range_picker_cancel_button: 'Annulla',
     igx_date_range_picker_last7Days: 'Ultimi 7 giorni',
     igx_date_range_picker_currentMonth: 'Mese corrente',
     igx_date_range_picker_last30Days: 'Ultimi 30 giorni',
diff --git a/projects/igniteui-angular-i18n/src/i18n/JA/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/JA/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsJA = {
     igx_date_range_picker_date_separator: '～',
     igx_date_range_picker_done_button: '完了',
-    igx_date_range_picker_cancel_button: 'キャンセル'
+    igx_date_range_picker_cancel_button: 'キャンセル',
     igx_date_range_picker_last7Days: '過去7日間',
     igx_date_range_picker_currentMonth: '今月',
     igx_date_range_picker_last30Days: '過去30日間',
diff --git a/projects/igniteui-angular-i18n/src/i18n/KO/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/KO/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsKO = {
     igx_date_range_picker_date_separator: '에',
     igx_date_range_picker_done_button: '완료',
-    igx_date_range_picker_cancel_button: '취소'
+    igx_date_range_picker_cancel_button: '취소',
     igx_date_range_picker_last7Days: '지난 7일',
     igx_date_range_picker_currentMonth: '이번 달',
     igx_date_range_picker_last30Days: '지난 30일',
diff --git a/projects/igniteui-angular-i18n/src/i18n/NB/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NB/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsNB = {
     igx_date_range_picker_date_separator: 'til',
     igx_date_range_picker_done_button: 'Ferdig',
-    igx_date_range_picker_cancel_button: 'Avbryt'
+    igx_date_range_picker_cancel_button: 'Avbryt',
     igx_date_range_picker_last7Days: 'Siste 7 dager',
     igx_date_range_picker_currentMonth: 'Denne måneden',
     igx_date_range_picker_last30Days: 'Siste 30 dager',
diff --git a/projects/igniteui-angular-i18n/src/i18n/NL/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NL/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsNL = {
     igx_date_range_picker_date_separator: 'tot',
     igx_date_range_picker_done_button: 'Gereed',
-    igx_date_range_picker_cancel_button: 'Annuleren'
+    igx_date_range_picker_cancel_button: 'Annuleren',
     igx_date_range_picker_last7Days: 'Laatste 7 dagen',
     igx_date_range_picker_currentMonth: 'Huidige maand',
     igx_date_range_picker_last30Days: 'Laatste 30 dagen',
diff --git a/projects/igniteui-angular-i18n/src/i18n/PL/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PL/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsPL = {
     igx_date_range_picker_date_separator: 'do',
     igx_date_range_picker_done_button: 'Gotowe',
-    igx_date_range_picker_cancel_button: 'Anuluj'
+    igx_date_range_picker_cancel_button: 'Anuluj',
     igx_date_range_picker_last7Days: 'Ostatnie 7 dni',
     igx_date_range_picker_currentMonth: 'Bieżący miesiąc',
     igx_date_range_picker_last30Days: 'Ostatnie 30 dni',
diff --git a/projects/igniteui-angular-i18n/src/i18n/PT/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PT/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsPT = {
     igx_date_range_picker_date_separator: 'para',
     igx_date_range_picker_done_button: 'Concluído',
-    igx_date_range_picker_cancel_button: 'Cancelar'
+    igx_date_range_picker_cancel_button: 'Cancelar',
     igx_date_range_picker_last7Days: 'Últimos 7 dias',
     igx_date_range_picker_currentMonth: 'Mês atual',
     igx_date_range_picker_last30Days: 'Últimos 30 dias',
diff --git a/projects/igniteui-angular-i18n/src/i18n/RO/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/RO/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsRO = {
     igx_date_range_picker_date_separator: 'la',
     igx_date_range_picker_done_button: 'Gata',
-    igx_date_range_picker_cancel_button: 'Anulează'
+    igx_date_range_picker_cancel_button: 'Anulează',
     igx_date_range_picker_last7Days: 'Ultimele 7 zile',
     igx_date_range_picker_currentMonth: 'Luna curentă',
     igx_date_range_picker_last30Days: 'Ultimele 30 de zile',
diff --git a/projects/igniteui-angular-i18n/src/i18n/SV/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/SV/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsSV = {
     igx_date_range_picker_date_separator: 'till',
     igx_date_range_picker_done_button: 'Färdig',
-    igx_date_range_picker_cancel_button: 'Avbryt'
+    igx_date_range_picker_cancel_button: 'Avbryt',
     igx_date_range_picker_last7Days: 'Senaste 7 dagarna',
     igx_date_range_picker_currentMonth: 'Aktuell månad',
     igx_date_range_picker_last30Days: 'Senaste 30 dagarna',
diff --git a/projects/igniteui-angular-i18n/src/i18n/TR/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/TR/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsTR = {
     igx_date_range_picker_date_separator: '-',
     igx_date_range_picker_done_button: 'Bitti',
-    igx_date_range_picker_cancel_button: 'İptal'
+    igx_date_range_picker_cancel_button: 'İptal',
     igx_date_range_picker_last7Days: 'Son 7 gün',
     igx_date_range_picker_currentMonth: 'Geçerli ay',
     igx_date_range_picker_last30Days: 'Son 30 gün',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsZHHANS = {
     igx_date_range_picker_date_separator: '至',
     igx_date_range_picker_done_button: '完成',
-    igx_date_range_picker_cancel_button: '取消'
+    igx_date_range_picker_cancel_button: '取消',
     igx_date_range_picker_last7Days: '最近7天',
     igx_date_range_picker_currentMonth: '本月',
     igx_date_range_picker_last30Days: '最近30天',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/date-range-picker-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/date-range-picker-resources.ts
@@ -7,7 +7,7 @@ import { IDateRangePickerResourceStrings } from 'igniteui-angular';
 export const DateRangePickerResourceStringsZHHANT = {
     igx_date_range_picker_date_separator: '到',
     igx_date_range_picker_done_button: '完成',
-    igx_date_range_picker_cancel_button: '取消'
+    igx_date_range_picker_cancel_button: '取消',
     igx_date_range_picker_last7Days: '最近7天',
     igx_date_range_picker_currentMonth: '本月',
     igx_date_range_picker_last30Days: '最近30天',
diff --git a/projects/igniteui-angular/src/lib/core/i18n/date-range-picker-resources.ts b/projects/igniteui-angular/src/lib/core/i18n/date-range-picker-resources.ts
@@ -2,7 +2,6 @@ export interface IDateRangePickerResourceStrings {
     igx_date_range_picker_date_separator?: string;
     igx_date_range_picker_done_button?: string;
     igx_date_range_picker_cancel_button?: string;
-};
     igx_date_range_picker_last7Days?: string;
     igx_date_range_picker_currentMonth?: string;
     igx_date_range_picker_last30Days?: string;
@@ -12,7 +11,7 @@ export interface IDateRangePickerResourceStrings {
 export const DateRangePickerResourceStringsEN: IDateRangePickerResourceStrings = {
     igx_date_range_picker_date_separator: 'to',
     igx_date_range_picker_done_button: 'Done',
-    igx_date_range_picker_cancel_button: 'Cancel'
+    igx_date_range_picker_cancel_button: 'Cancel',
     igx_date_range_picker_last7Days: 'Last 7 Days',
     igx_date_range_picker_currentMonth: 'Current Month',
     igx_date_range_picker_last30Days: 'Last 30 Days',
diff --git a/projects/igniteui-angular/src/lib/date-common/calendar-container/calendar-container.component.html b/projects/igniteui-angular/src/lib/date-common/calendar-container/calendar-container.component.html
@@ -37,8 +37,6 @@
 </ng-template>
 
 <igx-calendar></igx-calendar>
-@if (pickerActions?.template || (closeButtonLabel || cancelButtonLabel || todayButtonLabel)) {
-
  @if( usePredefinedRanges || (customRanges?.length || 0) > 0 ){
         <igx-predefined-ranges-area
             [usePredefinedRanges]="usePredefinedRanges"
diff --git a/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts b/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts
@@ -1164,6 +1164,7 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
         componentInstance.calendarCancel.pipe(takeUntil(this._destroy$)).subscribe(() => {
             this._value = this._originalValue;
             this.close()
+        });
         componentInstance.rangeSelected
         .pipe(takeUntil(this._destroy$))
         .subscribe((r: DateRange) => {
