@ui5/webcomponents 1.5.0 → 1.6.0

package/dist/i18n/messagebundle_nl.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Geselecteerd
 
 LIST_ITEM_NOT_SELECTED=Niet geselecteerd
 
+LIST_ITEM_GROUP_HEADER=Groepskop
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Modus meervoudige selectie
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Elementselectie.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Knooppunt weergeven
 
 TREE_ITEM_COLLAPSE_NODE=Knooppunt verbergen
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Ongeldige invoer
 
 VALUE_STATE_WARNING=Waarschuwing opgetreden

package/dist/i18n/messagebundle_no.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Valgt
 
 LIST_ITEM_NOT_SELECTED=Ikke valgt
 
+LIST_ITEM_GROUP_HEADER=Gruppetopp
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Modus for flervalg
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Elementutvalg
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Utvid knutepunkt
 
 TREE_ITEM_COLLAPSE_NODE=Komprimer knutepunkt
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Ugyldige inndata
 
 VALUE_STATE_WARNING=Advarsel finnes

package/dist/i18n/messagebundle_pl.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Wybrane
 
 LIST_ITEM_NOT_SELECTED=Niewybrane
 
+LIST_ITEM_GROUP_HEADER=Nagłówek grupy
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Tryb wielokrotnego wyboru
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Wybór pozycji
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Rozwiń węzeł
 
 TREE_ITEM_COLLAPSE_NODE=Zwiń węzeł
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Nieprawidłowy wpis
 
 VALUE_STATE_WARNING=Wyprowadzono ostrzeżenie

package/dist/i18n/messagebundle_pt.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Selecionado
 
 LIST_ITEM_NOT_SELECTED=Não selecionado
 
+LIST_ITEM_GROUP_HEADER=Cabeçalho de grupo
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Modo de seleção múltipla
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Seleção de itens.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Expandir nó
 
 TREE_ITEM_COLLAPSE_NODE=Comprimir nó
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Entrada inválida
 
 VALUE_STATE_WARNING=Advertência existente

package/dist/i18n/messagebundle_pt_PT.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Selecionado
 
 LIST_ITEM_NOT_SELECTED=Não selecionado
 
+LIST_ITEM_GROUP_HEADER=Cabeçalho do grupo
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Modo de seleção múltipla
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Seleção de item.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Expandir nó
 
 TREE_ITEM_COLLAPSE_NODE=Fechar nó
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Entrada inválida
 
 VALUE_STATE_WARNING=Aviso emitido

package/dist/i18n/messagebundle_ro.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Selectat
 
 LIST_ITEM_NOT_SELECTED=Neselectat
 
+LIST_ITEM_GROUP_HEADER=Antet de grup
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Mod selecție multiplă
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Selecție de poziții.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Expandare nod
 
 TREE_ITEM_COLLAPSE_NODE=Comprimare nod
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Intrare nevalabilă
 
 VALUE_STATE_WARNING=Avertizare emisă

package/dist/i18n/messagebundle_ru.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Выбранные
 
 LIST_ITEM_NOT_SELECTED=Не выбрано
 
+LIST_ITEM_GROUP_HEADER=Заголовок группы
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Режим множественного выбора
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Выбор позиции
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Развернуть узел
 
 TREE_ITEM_COLLAPSE_NODE=Свернуть узел
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Недействительный ввод
 
 VALUE_STATE_WARNING=Выдано предупреждение

package/dist/i18n/messagebundle_sh.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Odabrano
 
 LIST_ITEM_NOT_SELECTED=Nije odabrano
 
+LIST_ITEM_GROUP_HEADER=Zaglavlje grupe
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Način višestrukog odabira
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Odabir stavke.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Proširi čvor
 
 TREE_ITEM_COLLAPSE_NODE=Sažmi čvor
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Nevažeći unos
 
 VALUE_STATE_WARNING=Upozorenja izdato

package/dist/i18n/messagebundle_sk.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Vybrané
 
 LIST_ITEM_NOT_SELECTED=Nevybrané
 
+LIST_ITEM_GROUP_HEADER=Hlavička skupiny
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Režim viacnásobného výberu
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Výber položky
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Rozbaliť uzol
 
 TREE_ITEM_COLLAPSE_NODE=Zbaliť uzol
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Neplatné zadanie
 
 VALUE_STATE_WARNING=Upozornenie zobrazené

package/dist/i18n/messagebundle_sl.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Izbrano
 
 LIST_ITEM_NOT_SELECTED=Ni izbrano
 
+LIST_ITEM_GROUP_HEADER=Glava skupine
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Modus večkratne izbire
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Izberi postavko.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Razširitev vozlišča
 
 TREE_ITEM_COLLAPSE_NODE=Skrčitev vozlišča
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Neveljaven vnos
 
 VALUE_STATE_WARNING=Opozorilo izdano

package/dist/i18n/messagebundle_sv.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Valda
 
 LIST_ITEM_NOT_SELECTED=Ej valda
 
+LIST_ITEM_GROUP_HEADER=Grupphuvud
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Flervalsläge
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Positionsurval.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Expandera nod
 
 TREE_ITEM_COLLAPSE_NODE=Komprimera nod
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Ogiltig inmatning
 
 VALUE_STATE_WARNING=Varning finns

package/dist/i18n/messagebundle_th.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=รายการที่เลือก
 
 LIST_ITEM_NOT_SELECTED=ไม่ได้เลือก
 
+LIST_ITEM_GROUP_HEADER=ข้อมูลส่วนหัวของกลุ่ม
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=โหมดการเลือกหลายรายการ
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=การเลือกรายการ
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=ขยายโหนด
 
 TREE_ITEM_COLLAPSE_NODE=ย่อรวมโหนด
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=การป้อนข้อมูลไม่ถูกต้อง
 
 VALUE_STATE_WARNING=ออกการแจ้งเตือนแล้ว

package/dist/i18n/messagebundle_tr.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Seçilenler
 
 LIST_ITEM_NOT_SELECTED=Seçilmedi
 
+LIST_ITEM_GROUP_HEADER=Grup başlığı
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Çoklu seçim kipi
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Öğe seçimi.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Düğümü genişlet
 
 TREE_ITEM_COLLAPSE_NODE=Düğümü daralt
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Geçersiz giriş
 
 VALUE_STATE_WARNING=Uyarı verildi

package/dist/i18n/messagebundle_uk.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Вибране
 
 LIST_ITEM_NOT_SELECTED=Не вибрано
 
+LIST_ITEM_GROUP_HEADER=Заголовок групи
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Режим множинного вибору
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Вибір позиції.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Розгорнути вузол
 
 TREE_ITEM_COLLAPSE_NODE=Згорнути вузол
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Недійсний запис
 
 VALUE_STATE_WARNING=Застереження видано

package/dist/i18n/messagebundle_vi.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=Được chọn
 
 LIST_ITEM_NOT_SELECTED=Không được chọn
 
+LIST_ITEM_GROUP_HEADER=Tiêu đề nhóm
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=Chế độ đa lựa chọn
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Lựa chọn mục.
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=Mở rộng nút
 
 TREE_ITEM_COLLAPSE_NODE=Thu gọn nút
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=Mục nhập không hợp lệ
 
 VALUE_STATE_WARNING=Cảnh báo được phát hành

package/dist/i18n/messagebundle_zh_CN.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=已选择
 
 LIST_ITEM_NOT_SELECTED=未选择
 
+LIST_ITEM_GROUP_HEADER=组抬头
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=多重选择模式
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=项目选择。
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=展开节点
 
 TREE_ITEM_COLLAPSE_NODE=折叠节点
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=无效输入
 
 VALUE_STATE_WARNING=已发出警告

package/dist/i18n/messagebundle_zh_TW.properties

@@ -113,6 +113,8 @@ LIST_ITEM_SELECTED=已勾選
 
 LIST_ITEM_NOT_SELECTED=未選擇
 
+LIST_ITEM_GROUP_HEADER=群組表頭
+
 ARIA_LABEL_LIST_ITEM_CHECKBOX=多重選擇模式
 
 ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=項目選擇。
@@ -229,6 +231,14 @@ TREE_ITEM_EXPAND_NODE=展開節點
 
 TREE_ITEM_COLLAPSE_NODE=收縮節點
 
+VALUE_STATE_TYPE_ERROR=Value State Error
+
+VALUE_STATE_TYPE_WARNING=Value State Warning
+
+VALUE_STATE_TYPE_SUCCESS=Value State Success
+
+VALUE_STATE_TYPE_INFORMATION=Value State Information
+
 VALUE_STATE_ERROR=無效輸入項
 
 VALUE_STATE_WARNING=已發出警告

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "UI5 Web Components: webcomponents.main",
   "ui5": {
     "webComponentsPackage": true
@@ -41,13 +41,13 @@
     "directory": "packages/main"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "1.5.0",
-    "@ui5/webcomponents-icons": "1.5.0",
-    "@ui5/webcomponents-localization": "1.5.0",
-    "@ui5/webcomponents-theming": "1.5.0"
+    "@ui5/webcomponents-base": "1.6.0",
+    "@ui5/webcomponents-icons": "1.6.0",
+    "@ui5/webcomponents-localization": "1.6.0",
+    "@ui5/webcomponents-theming": "1.6.0"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "1.5.0",
+    "@ui5/webcomponents-tools": "1.6.0",
     "chromedriver": "102.0.0"
   }
 }

package/src/BreadcrumbsItem.js

@@ -45,7 +45,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the accessible aria name of the item.
+		 * Defines the accessible ARIA name of the item.
 		 *
 		 * @type {string}
 		 * @defaultvalue undefined

package/src/Button.js

@@ -157,7 +157,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the accessible aria name of the component.
+		 * Defines the accessible ARIA name of the component.
 		 *
 		 * @type {string}
 		 * @defaultvalue: ""

package/src/Calendar.hbs

@@ -27,6 +27,7 @@
 			.selectedDates="{{_selectedDatesTimestamps}}"
 			._hidden="{{_isMonthPickerHidden}}"
 			.primaryCalendarType="{{_primaryCalendarType}}"
+			.secondaryCalendarType="{{secondaryCalendarType}}"
 			.minDate="{{minDate}}"
 			.maxDate="{{maxDate}}"
 			timestamp="{{_timestamp}}"
@@ -41,6 +42,7 @@
 			.selectedDates="{{_selectedDatesTimestamps}}"
 			._hidden="{{_isYearPickerHidden}}"
 			.primaryCalendarType="{{_primaryCalendarType}}"
+			.secondaryCalendarType="{{secondaryCalendarType}}"
 			.minDate="{{minDate}}"
 			.maxDate="{{maxDate}}"
 			timestamp="{{_timestamp}}"
@@ -61,6 +63,7 @@
 			.isMonthButtonHidden="{{_isHeaderMonthButtonHidden}}"
 			._monthButtonText="{{_headerMonthButtonText}}"
 			._yearButtonText="{{_headerYearButtonText}}"
+			._yearButtonTextSecType="{{_headerYearButtonTextSecType}}"
 			@ui5-previous-press="{{onHeaderPreviousPress}}"
 			@ui5-next-press="{{onHeaderNextPress}}"
 			@ui5-show-month-press="{{onHeaderShowMonthPress}}"

package/src/Calendar.js

@@ -1,3 +1,5 @@
+import transformDateToSecondaryType from "@ui5/webcomponents-localization/dist/dates/transformDateToSecondaryType.js";
+import convertMonthNumbersToMonthNames from "@ui5/webcomponents-localization/dist/dates/convertMonthNumbersToMonthNames.js";
 import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDate.js";
 import { renderFinished } from "@ui5/webcomponents-base/dist/Render.js";
 import {
@@ -86,6 +88,10 @@ const metadata = {
 		_headerYearButtonText: {
 			type: String,
 		},
+
+		_headerYearButtonTextSecType: {
+			type: String,
+		},
 	},
 	managedSlots: true,
 	slots: /** @lends sap.ui.webcomponents.main.Calendar.prototype */ {
@@ -302,6 +308,8 @@ class Calendar extends CalendarPart {
 		} else {
 			this._headerYearButtonText = String(yearFormat.format(this._localDate, true));
 		}
+
+		this.secondaryCalendarType && this._setSecondaryCalendarTypeButtonText();
 	}
 
 	/**
@@ -340,6 +348,27 @@ class Calendar extends CalendarPart {
 		this._currentPickerDOM._showNextPage();
 	}
 
+	_setSecondaryCalendarTypeButtonText() {
+		const localeData = getCachedLocaleDataInstance(getLocale());
+		const yearFormatSecType = DateFormat.getDateInstance({ format: "y", calendarType: this.secondaryCalendarType });
+		this._headerMonthButtonTextInSexType = localeData.getMonthsStandAlone("wide", this.secondaryCalendarType)[this._calendarDate.getMonth()];
+
+		if (this._currentPicker === "year") {
+			const rangeStart = new CalendarDate(this._calendarDate, this._primaryCalendarType);
+			const rangeEnd = new CalendarDate(this._calendarDate, this._primaryCalendarType);
+			rangeStart.setYear(this._currentPickerDOM._firstYear);
+			rangeEnd.setYear(this._currentPickerDOM._lastYear);
+
+			const rangeStartSecType = transformDateToSecondaryType(this.primaryCalendarType, this.secondaryCalendarType, rangeStart.valueOf() / 1000, true)
+				.firstDate;
+			const rangeEndSecType = transformDateToSecondaryType(this.primaryCalendarType, this.secondaryCalendarType, rangeEnd.valueOf() / 1000, true)
+				.lastDate;
+			this._headerYearButtonTextSecType = `${yearFormatSecType.format(rangeStartSecType.toLocalJSDate(), true)} - ${yearFormatSecType.format(rangeEndSecType.toLocalJSDate(), true)}`;
+		} else {
+			this._headerYearButtonTextSecType = String(yearFormatSecType.format(this._localDate, true));
+		}
+	}
+
 	get secondaryCalendarTypeButtonText() {
 		if (!this.secondaryCalendarType) {
 			return;
@@ -347,58 +376,17 @@ class Calendar extends CalendarPart {
 
 		const localDate = new Date(this._timestamp * 1000);
 		const secondYearFormat = DateFormat.getDateInstance({ format: "y", calendarType: this.secondaryCalendarType });
-		const secondMonthInfo = this._getDisplayedSecondaryMonthText();
+		const dateInSecType = transformDateToSecondaryType(this._primaryCalendarType, this.secondaryCalendarType, this._timestamp);
+		const secondMonthInfo = convertMonthNumbersToMonthNames(dateInSecType.firstDate.getMonth(), dateInSecType.lastDate.getMonth(), this.secondaryCalendarType);
 		const secondYearText = secondYearFormat.format(localDate, true);
+
 		return {
 			yearButtonText: secondYearText,
 			monthButtonText: secondMonthInfo.text,
-			monthButtonInfo: secondMonthInfo.info,
-		};
-	}
-
-	_getDisplayedSecondaryMonthText() {
-		const month = this._getDisplayedSecondaryMonths();
-		const localeData = getCachedLocaleDataInstance(getLocale());
-		const pattern = localeData.getIntervalPattern();
-		const secondaryMonthsNames = getCachedLocaleDataInstance(getLocale()).getMonthsStandAlone("abbreviated", this.secondaryCalendarType);
-		const secondaryMonthsNamesWide = getCachedLocaleDataInstance(getLocale()).getMonthsStandAlone("wide", this.secondaryCalendarType);
-
-		if (month.startMonth === month.endMonth) {
-			return {
-				text: localeData.getMonths("abbreviated", this.secondaryCalendarType)[month.startMonth],
-				textInfo: localeData.getMonths("wide", this.secondaryCalendarType)[month.startMonth],
-			};
-		}
-
-		return {
-			text: pattern.replace(/\{0\}/, secondaryMonthsNames[month.startMonth]).replace(/\{1\}/, secondaryMonthsNames[month.endMonth]),
-			textInfo: pattern.replace(/\{0\}/, secondaryMonthsNamesWide[month.startMonth]).replace(/\{1\}/, secondaryMonthsNamesWide[month.endMonth]),
+			monthButtonInfo: secondMonthInfo.textInfo,
 		};
 	}
 
-	_getDisplayedSecondaryMonths() {
-		const localDate = new Date(this._timestamp * 1000);
-		let firstDate = CalendarDate.fromLocalJSDate(localDate, this._primaryCalendarType);
-		firstDate.setDate(1);
-		firstDate = new CalendarDate(firstDate, this.secondaryCalendarType);
-		const startMonth = firstDate.getMonth();
-
-		let lastDate = CalendarDate.fromLocalJSDate(localDate, this._primaryCalendarType);
-		lastDate.setDate(this._getDaysInMonth(lastDate));
-		lastDate = new CalendarDate(lastDate, this.secondaryCalendarType);
-		const endMonth = lastDate.getMonth();
-
-		return { startMonth, endMonth };
-	}
-
-	_getDaysInMonth(date) {
-		const tempCalendarDate = new CalendarDate(date);
-		tempCalendarDate.setDate(1);
-		tempCalendarDate.setMonth(tempCalendarDate.getMonth() + 1);
-		tempCalendarDate.setDate(0);
-		return tempCalendarDate.getDate();
-	}
-
 	/**
 	 * The month button is hidden when the month picker or year picker is shown
 	 * @returns {boolean}

package/src/CalendarHeader.hbs

@@ -35,7 +35,7 @@
 		>
 			<span>{{_yearButtonText}}</span>
 			{{#if hasSecondaryCalendarType}}
-				<span class="ui5-calheader-btn-sectext">{{_secondYearButtonText}}</span>
+				<span class="ui5-calheader-btn-sectext">{{_yearButtonTextSecType}}</span>
 			{{/if}}
 		</div>
 	</div>

package/src/CalendarHeader.js

@@ -78,6 +78,10 @@ const metadata = {
 			type: String,
 		},
 
+		_yearButtonTextSecType: {
+			type: String,
+		},
+
 		isYearButtonHidden: {
 			type: Boolean,
 		},
@@ -199,7 +203,7 @@ class CalendarHeader extends UI5Element {
 	get accInfo() {
 		return {
 			ariaLabelMonthButton: this.hasSecondaryCalendarType
-				? `${this._monthButtonText}, ${this.buttonTextForSecondaryCalendarType.info}` : `${this._monthButtonText}`,
+				? `${this._monthButtonText}, ${this.buttonTextForSecondaryCalendarType.monthButtonInfo}` : `${this._monthButtonText}`,
 		};
 	}
 }

package/src/CardHeader.hbs

@@ -27,7 +27,7 @@
 						id="{{_id}}-title"
 						class="ui5-card-header-title"
 						part="title"
-						aria-role="heading"
+						role="heading"
 						aria-level="3"
 					>{{titleText}}</div>
 				{{/if}}

package/src/CheckBox.js

@@ -46,7 +46,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the accessible aria name of the component.
+		 * Defines the accessible ARIA name of the component.
 		 *
 		 * @type {string}
 		 * @public

package/src/ComboBox.hbs

@@ -1,6 +1,6 @@
 <div class="ui5-combobox-root ui5-input-focusable-element">
 	{{#if hasValueState}}
-		<span id="{{_id}}-valueStateDesc" class="ui5-hidden-text">{{valueStateText}}</span>
+		<span id="{{_id}}-valueStateDesc" class="ui5-hidden-text">{{ariaValueStateHiddenText}}</span>
 	{{/if}}
 
 	<input id="ui5-combobox-input"