@openui5/sap.ui.unified 1.107.1 → 1.108.0

package/THIRDPARTY.txt

@@ -382,7 +382,7 @@ Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/D
 
 Library: sap.ui.integration:
 
-Component: UI5 Web Components, version: 1.0.1
+Component: UI5 Web Components, version: 1.7.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.107.1",
+  "version": "1.108.0",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.107.1"
+    "@openui5/sap.ui.core": "1.108.0"
   }
 }

package/src/sap/ui/unified/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.107.1</version>
+  <version>1.108.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -28,7 +28,8 @@ sap.ui.define([
 	"sap/ui/dom/containsOrEquals",
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
-	"sap/ui/core/Configuration"
+	"sap/ui/core/Configuration",
+	"sap/ui/core/date/CalendarWeekNumbering"
 ], function(
 	CalendarType,
 	Control,
@@ -53,7 +54,8 @@ sap.ui.define([
 	containsOrEquals,
 	deepEqual,
 	Log,
-	Configuration
+	Configuration,
+	CalendarWeekNumbering
 ) {
 	"use strict";
 
@@ -72,7 +74,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public
@@ -107,8 +109,9 @@ sap.ui.define([
 			months : {type : "int", group : "Appearance", defaultValue : 1},
 
 			/**
-			 * If set, the first day of the displayed week is this day. Valid values are 0 to 6.
-			 * If not a valid value is set, the default of the used locale is used.
+			 * If the property is set, this day marks the start of the displayed week. Valid values are 0 to 6.
+			 * If no valid property is set, the current locale's default is applied.
+			 * Note: This property should not be used with the calendarWeekNumbering property.
 			 * @since 1.28.9
 			 */
 			firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1},
@@ -196,7 +199,15 @@ sap.ui.define([
 			 *
 			 * @since 1.84.0
 			 */
-			_currentPicker : {type : "string", group : "Appearance", visibility: "hidden"}
+			_currentPicker : {type : "string", group : "Appearance", visibility: "hidden"},
+
+			/**
+			 * If set, the calendar week numbering is used for display.
+			 * If not set, the calendar week numbering of the global configuration is used.
+			 * Note: This property should not be used with firstDayOfWeek property.
+			 * @since 1.108.0
+			 */
+			calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 
 		},
 		aggregations : {
@@ -474,7 +485,7 @@ sap.ui.define([
 	};
 
 	Calendar.prototype._createMonth = function(sId){
-		var oMonth = new Month(sId, {width: "100%"});
+		var oMonth = new Month(sId, {width: "100%", calendarWeekNumbering: this.getCalendarWeekNumbering()});
 		oMonth._bCalendar = true;
 		oMonth.attachEvent("datehovered", this._handleDateHovered, this);
 		oMonth.attachEvent("weekNumberSelect", this._handleWeekNumberSelect, this);
@@ -516,6 +527,10 @@ sap.ui.define([
 			oMonthDate = aMonths[0].getDate(),
 			oFocusedDate = this._getFocusedDate();
 
+		if (this.getFirstDayOfWeek() !== -1 && this.getCalendarWeekNumbering() !== "Default") {
+			Log.warning("Both properties firstDayOfWeek and calendarWeekNumbering should not be used at the same time!");
+		}
+
 		if (aMonths.length > 1 && oMonthDate) {
 			// for more than one month - re-render same months (if already rendered once)
 			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.getPrimaryCalendarType());
@@ -769,6 +784,17 @@ sap.ui.define([
 
 	};
 
+	Calendar.prototype.setCalendarWeekNumbering = function(sCalendarWeekNumbering) {
+		var aMonths = this.getAggregation("month");
+
+		this.setProperty("calendarWeekNumbering", sCalendarWeekNumbering);
+
+		for (var i = 0; i < aMonths.length; i++) {
+			aMonths[i].setProperty("calendarWeekNumbering", sCalendarWeekNumbering);
+		}
+
+		return this;
+	};
 	Calendar.prototype.setMonths = function(iMonths){
 
 		this._bDateRangeChanged = undefined; // to force rerendering
@@ -789,6 +815,7 @@ sap.ui.define([
 				oMonth.attachEvent("_unbindMousemove", _handleUnbindMousemove, this);
 				oMonth._bNoThemeChange = true;
 				oMonth._bNotInTabChain = true;
+				oMonth.setCalendarWeekNumbering(this.getCalendarWeekNumbering());
 				oMonth.setSecondaryCalendarType(this._getSecondaryCalendarType());
 				this.addAggregation("month",oMonth);
 			}

package/src/sap/ui/unified/CalendarAppointment.js

@@ -21,7 +21,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegend.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarMonthInterval.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarOneMonthInterval.js

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.107.1
+		 * @version 1.108.0
 		 *
 		 * @constructor
 		 * @private
@@ -82,7 +82,7 @@ sap.ui.define([
 				oCalendar.attachEvent("select", function () {
 					var oCalPicker = this._getCalendar(),
 						oCalPickerFocusedDate = oCalPicker._getFocusedDate(),
-						oNewStartDate = CalendarUtils._getFirstDateOfMonth(oCalPickerFocusedDate);
+						oNewStartDate = CalendarUtils._getFirstDateOfMonth(new CalendarDate(oCalPickerFocusedDate, this.getPrimaryCalendarType()));
 					var oOneMonthDateRow = this.getAggregation("month")[0];
 
 					this._setStartDate(oNewStartDate);
@@ -133,7 +133,7 @@ sap.ui.define([
 		CalendarOneMonthInterval.prototype._handleFocus = function (oEvent) {
 			var bOutsideVisibleArea = !!oEvent.getParameter("_outsideBorder"),
 				oDateTime = oEvent.getParameter("date"),
-				oCalDate = CalendarDate.fromLocalJSDate(oDateTime),
+				oCalDate = CalendarDate.fromLocalJSDate(oDateTime, this.getPrimaryCalendarType()),
 				oCalStartDate = CalendarDate.fromLocalJSDate(this.getStartDate()),
 				bIsOtherMonth = !CalendarUtils._isSameMonthAndYear(oCalDate, oCalStartDate),
 				iDays,
@@ -302,7 +302,7 @@ sap.ui.define([
 			var iYearMin = this._oMinDate.getYear();
 			var iMonthMax = this._oMaxDate.getMonth();
 			var iMonthMin = this._oMinDate.getMonth();
-			var oFirstOfMonth = CalendarUtils._getFirstDateOfMonth(oDate);
+			var oFirstOfMonth = CalendarUtils._getFirstDateOfMonth(new CalendarDate(oDate, this.getPrimaryCalendarType()));
 			var oFirstOfNextMonth = new CalendarDate(oFirstOfMonth),
 				iYear, iMonth;
 			oFirstOfNextMonth.setMonth(oFirstOfNextMonth.getMonth() + 1);

package/src/sap/ui/unified/CalendarRow.js

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarTimeInterval.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarWeekInterval.js

@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		 * its start date to the first date of the same week as the date the user chose.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.107.1
+		 * @version 1.108.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/ColorPicker.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ColorPickerPopover.js

@@ -47,7 +47,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.107.1
+		 * @version 1.108.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/ContentSwitcher.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/Currency.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/unified/CurrencyRenderer.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Core"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @namespace
 	 */
 	var CurrencyRenderer = {

package/src/sap/ui/unified/DateRange.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/calendar/Cale
 	 * @class
 	 * Date range for use in DatePicker
 	 * @extends sap.ui.core.Element
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/DateTypeRange.js

@@ -25,7 +25,7 @@ sap.ui.define(['./DateRange', './library'],
 	 * @class
 	 * Date range with calendar day type information. Used to visualize special days in the Calendar.
 	 * @extends sap.ui.unified.DateRange
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/FileUploader.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public
@@ -1046,7 +1046,7 @@ sap.ui.define([
 	FileUploader.prototype.setEnabled = function(bEnabled){
 		var $oFileUpload = jQuery(this.oFileUpload);
 
-		this.setProperty("enabled", bEnabled);
+		this.setProperty("enabled", bEnabled, false);
 		this.oFilePath.setEnabled(bEnabled);
 		this.oBrowse.setEnabled(bEnabled);
 
@@ -1061,7 +1061,7 @@ sap.ui.define([
 
 	FileUploader.prototype.setValueState = function(sValueState) {
 
-		this.setProperty("valueState", sValueState, true);
+		this.setProperty("valueState", sValueState, false);
 		//as of 1.23.1 oFilePath can be an sap.ui.commons.TextField or an sap.m.Input, which both have a valueState
 		if (this.oFilePath.setValueState) {
 			this.oFilePath.setValueState(sValueState);
@@ -1098,7 +1098,7 @@ sap.ui.define([
 			Log.warning("Setting the valueStateText property with the combination of libraries used is not supported.", this);
 		}
 
-		return this.setProperty("valueStateText", sValueStateText, true);
+		return this.setProperty("valueStateText", sValueStateText, false);
 	};
 
 	FileUploader.prototype.setStyle = function(sStyle) {

package/src/sap/ui/unified/FileUploaderParameter.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/FileUploaderXHRSettings.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.107.1
+		 * @version 1.108.0
 		 *
 		 * @constructor
 		 * @since 1.52

package/src/sap/ui/unified/Menu.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

package/src/sap/ui/unified/MenuItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library', 'sap/ui/co
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

package/src/sap/ui/unified/MenuItemBase.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

package/src/sap/ui/unified/MenuRenderer.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/Configuration"],
 	 * Menu renderer.
 	 * @author SAP - TD Core UI&AM UI Infra
 	 *
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @namespace
 	 */
 	var MenuRenderer = {

package/src/sap/ui/unified/MenuTextFieldItem.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

package/src/sap/ui/unified/Shell.js

@@ -25,7 +25,7 @@ sap.ui.define(['./ShellHeader', './ShellLayout', './library', './ShellRenderer']
 	 * @extends sap.ui.unified.ShellLayout
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ShellHeadItem.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ShellHeadUserItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ShellLayout.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/ShellOverlay.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/SplitContainer.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/CalendarUtils.js

@@ -583,10 +583,11 @@ sap.ui.define([
 		CalendarUtils._getFirstDateOfMonth = function(oCalendarDate) {
 			this._checkCalendarDate(oCalendarDate);
 
-			var oJSDate = CalendarUtils.getFirstDateOfMonth(oCalendarDate.toUTCJSDate()).getJSDate();
-			oJSDate.setFullYear(oJSDate.getUTCFullYear(), oJSDate.getUTCMonth(), oJSDate.getUTCDate());
+			var oCalendarDateFirstDay = new CalendarDate(oCalendarDate, oCalendarDate.getCalendarType());
 
-			return CalendarDate.fromLocalJSDate(oJSDate, oCalendarDate.getCalendarType());
+			oCalendarDateFirstDay.setDate(1);
+
+			return oCalendarDateFirstDay;
 		};
 
 		/**

package/src/sap/ui/unified/calendar/DatesRow.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.unified.calendar.Month
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/DatesRowRenderer.js

@@ -187,7 +187,7 @@ sap.ui.define(['sap/ui/core/Renderer', 'sap/ui/unified/calendar/CalendarDate', '
 			oDay.setDate(oDay.getDate() + 1);
 		}
 
-		var aMonthNames = oLocaleData.getMonthsStandAlone("wide");
+		var aMonthNames = oLocaleData.getMonthsStandAlone("wide", oDatesRow.getPrimaryCalendarType());
 		for (i = 0; i < aMonthDays.length; i++) {
 			var oMonthDays = aMonthDays[i];
 			sWidth = ( 100 / iDays * oMonthDays.iDays) + "%";
@@ -210,6 +210,7 @@ sap.ui.define(['sap/ui/core/Renderer', 'sap/ui/unified/calendar/CalendarDate', '
 		var iDays = oDatesRow.getDays();
 		var sWidth = ( 100 / iDays ) + "%";
 		var bShowDayNamesLine = oDatesRow.getShowDayNamesLine();
+		var sCalendarType = oDatesRow.getPrimaryCalendarType();
 
 		if (!oDate) {
 			oDate = oDatesRow._getFocusedDate();
@@ -219,14 +220,13 @@ sap.ui.define(['sap/ui/core/Renderer', 'sap/ui/unified/calendar/CalendarDate', '
 
 		if (!bShowDayNamesLine) {
 			if (oDatesRow._bLongWeekDays || !oDatesRow._bNamesLengthChecked) {
-				oHelper.aWeekDays = oHelper.oLocaleData.getDaysStandAlone("abbreviated");
+				oHelper.aWeekDays = oHelper.oLocaleData.getDaysStandAlone("abbreviated", sCalendarType);
 			} else {
-				oHelper.aWeekDays = oHelper.oLocaleData.getDaysStandAlone("narrow");
+				oHelper.aWeekDays = oHelper.oLocaleData.getDaysStandAlone("narrow", sCalendarType);
 			}
-			oHelper.aWeekDaysWide = oHelper.oLocaleData.getDaysStandAlone("wide");
+			oHelper.aWeekDaysWide = oHelper.oLocaleData.getDaysStandAlone("wide", sCalendarType);
 		}
-
-		var oDay = new CalendarDate(oDate, oDatesRow.getPrimaryCalendarType());
+		var oDay = new CalendarDate(oDate, sCalendarType);
 
 		for (var i = 0; i < iDays; i++) {
 			this.renderDay(oRm, oDatesRow, oDay, oHelper, false, false, i, sWidth, !bShowDayNamesLine);

package/src/sap/ui/unified/calendar/Header.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * <b>Note:</b> This is used inside the calendar. Not for standalone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/IndexPicker.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * This control serves for picking an item from a grid with items which are relative periods in Plannig Calendar.
 	 * This is used inside the sap.m.PlanningCalendar relative views. Not for stand alone usage.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/calendar/Month.js

@@ -23,7 +23,10 @@ sap.ui.define([
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery",
 	'sap/ui/core/InvisibleMessage',
-	"sap/ui/core/Configuration"
+	"sap/ui/core/Configuration",
+	"sap/ui/core/date/CalendarWeekNumbering",
+	"sap/ui/core/date/CalendarUtils",
+	"sap/base/Log"
 ], function(
 	Control,
 	Device,
@@ -42,7 +45,10 @@ sap.ui.define([
 	KeyCodes,
 	jQuery,
 	InvisibleMessage,
-	Configuration
+	Configuration,
+	CalendarWeekNumbering,
+	CalendarDateUtils,
+	Log
 ) {
 	"use strict";
 
@@ -71,7 +77,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public
@@ -104,8 +110,9 @@ sap.ui.define([
 			showHeader : {type : "boolean", group : "Appearance", defaultValue : false},
 
 			/**
-			 * If set, the first day of the displayed week is this day. Valid values are 0 to 6.
-			 * If not a valid value is set, the default of the used locale is used.
+			 * If the property is set, this day marks the start of the displayed week. Valid values are 0 to 6.
+			 * If no valid property is set, the current locale's default is applied.
+			 * Note: This property should not be used with the calendarWeekNumbering property.
 			 * @since 1.28.9
 			 */
 			firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1},
@@ -154,7 +161,15 @@ sap.ui.define([
 			 *
 			 * @since 1.90
 			 */
-			_focusedDate : {type : "object", group : "Data", visibility: "hidden", defaultValue: null}
+			_focusedDate : {type : "object", group : "Data", visibility: "hidden", defaultValue: null},
+
+			/**
+			 * If set, the calendar week numbering is used for display.
+			 * If not set, the calendar week numbering of the global configuration is used.
+			 * Note: This property should not be used with firstDayOfWeek property.
+			 * @since 1.108.0
+			 */
+			 calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 
 		},
 		aggregations : {
@@ -304,6 +319,12 @@ sap.ui.define([
 		return this.getDomRef() && this._oItemNavigation.getItemDomRefs()[this._oItemNavigation.getFocusedIndex()];
 	};
 
+	Month.prototype.onBeforeRendering = function() {
+		if (this.getFirstDayOfWeek() !== -1 && this.getCalendarWeekNumbering() !== "Default") {
+			Log.warning("Both properties firstDayOfWeek and calendarWeekNumbering should not be used at the same time!");
+		}
+	};
+
 	Month.prototype.onAfterRendering = function(){
 		this.bSpaceButtonPressed = false;
 		_initItemNavigation.call(this);
@@ -754,8 +775,14 @@ sap.ui.define([
 		}
 
 		if (iFirstDayOfWeek < 0 || iFirstDayOfWeek > 6) {
-			var oLocaleData = this._getLocaleData();
-			iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
+			var oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(this.getCalendarWeekNumbering(), new Locale(this._getLocale()));
+
+			if (oWeekConfigurationValues) {
+				iFirstDayOfWeek = oWeekConfigurationValues.firstDayOfWeek;
+			} else {
+				var oLocaleData = this._getLocaleData();
+				iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
+			}
 		}
 
 		return iFirstDayOfWeek;
@@ -1577,17 +1604,19 @@ sap.ui.define([
 	 * @private
 	 */
 	Month.prototype._calculateWeekNumber = function (oDate) {
-		var oEndDate = this._getLastWeekDate(oDate);
 		var oLocale = new Locale(this._getLocale());
+		var oEndDate = this._getLastWeekDate(oDate);
 		var oLocaleData = this._getLocaleData();
-		var oDateFormat = DateFormat.getInstance({pattern: "w", calendarType: this.getPrimaryCalendarType()}, oLocale);
+		var oDateFormat;
 		var iWeekNumber;
 
-		// Because the date we use to calculate the week number may be in one year and in the same time
-		// includes days in a new month into a new year, we explicitly changed the week number
-		// US calendar weeks overlap Jan 1st is always week 1 while Dec 31st is always last week number
+		oDateFormat = DateFormat.getInstance({pattern: "w", calendarType: this.getPrimaryCalendarType(), calendarWeekNumbering: this.getCalendarWeekNumbering()}, oLocale);
+
 		var bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
 
+		// Because the date we use to calculate the week number may be in one year and in the same time
+		// includes days in a new month into a new year, we explicitly changed the week number
+		// US calendar weeks overlap, Jan 1st is always week 1, while Dec 31st is always last week.
 		if (oEndDate.getMonth() === 0 && this._oDate.getMonth() === 0  && bIsRegionUS) {
 			iWeekNumber = oDateFormat.format(oEndDate.toUTCJSDate(), true);
 		} else {

package/src/sap/ui/unified/calendar/MonthPicker.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * renders a MonthPicker with ItemNavigation
 	 * This is used inside the calendar. Not for stand alone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/MonthRenderer.js

@@ -473,7 +473,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		//oMonth.getDate() is a public date object, so it is always considered local timezones.
 		if (((oMonth.getParent() && oMonth.getParent().getMetadata().getName() === "sap.ui.unified.CalendarOneMonthInterval")
 			|| (oMonth.getMetadata().getName() === "sap.ui.unified.calendar.OneMonthDatesRow"))
-			&& oMonth.getStartDate() && oDay.getMonth() !== oMonth.getStartDate().getMonth()) {
+			&& oMonth.getStartDate() && oHelper.iMonth !== oDay.getMonth()) {
 			oRm.class("sapUiCalItemOtherMonth");
 		}
 

package/src/sap/ui/unified/calendar/MonthsRow.js

@@ -38,9 +38,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// shortcut for sap.ui.core.CalendarType
-	var CalendarType = coreLibrary.CalendarType;
-
 	/*
 	 * <code>CalendarDate</code> objects are used inside the <code>MonthsRow</code>, whereas JavaScript dates are used in the API.
 	 * This means that a conversion must be performed for the API functions.
@@ -63,7 +60,7 @@ sap.ui.define([
 	 * The MontsRow works with JavaScript Date objects, but only the month and the year are used to display and interact.
 	 * As representation for a month, the 1st of the month will always be returned in the API.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public
@@ -107,7 +104,15 @@ sap.ui.define([
 			/**
 			 * If set, a header with the years is shown to visualize what month belongs to what year.
 			 */
-			showHeader : {type : "boolean", group : "Appearance", defaultValue : false}
+			showHeader : {type : "boolean", group : "Appearance", defaultValue : false},
+
+			/**
+			 * If set, the calendar type is used for display.
+			 * If not set, the calendar type of the global configuration is used.
+			 * @private
+			 * @since 1.108.0
+			 */
+			primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null}
 		},
 		aggregations : {
 
@@ -169,10 +174,11 @@ sap.ui.define([
 	}, renderer: MonthsRowRenderer});
 
 	MonthsRow.prototype.init = function(){
+		var sCalendarType = this.getProperty("primaryCalendarType");
 
 		//need day in pattern because in islamic calendar 2 Month can start in one gregorianic calendar
-		this._oFormatYyyymm = DateFormat.getInstance({pattern: "yyyyMMdd", calendarType: CalendarType.Gregorian});
-		this._oFormatLong = DateFormat.getInstance({pattern: "MMMM y"});
+		this._oFormatYyyymm = DateFormat.getInstance({pattern: "yyyyMMdd", calendarType: sCalendarType});
+		this._oFormatLong = DateFormat.getInstance({pattern: "MMMM y", calendarType: sCalendarType});
 
 		this._mouseMoveProxy = jQuery.proxy(this._handleMouseMove, this);
 
@@ -264,7 +270,7 @@ sap.ui.define([
 	 */
 	MonthsRow.prototype.setDate = function(oDate){
 		if (oDate) {
-			var oCalDate = CalendarDate.fromLocalJSDate(oDate);
+			var oCalDate = CalendarDate.fromLocalJSDate(oDate, this.getProperty("primaryCalendarType"));
 			this._oDate = oCalDate;
 			_changeDate.call(this, oCalDate, false);
 		}
@@ -279,11 +285,11 @@ sap.ui.define([
 	*/
 	MonthsRow.prototype._getDate = function(){
 
-		if (!this._oDate ) {
-			this._oDate  = new CalendarDate();
+		if (!this._oDate) {
+			this._oDate  = CalendarDate.fromLocalJSDate(new Date(), this.getProperty("primaryCalendarType"));
 		}
 
-		return this._oDate ;
+		return this._oDate;
 
 	};
 
@@ -300,7 +306,7 @@ sap.ui.define([
 		iYear = oStartDate.getFullYear();
 		CalendarUtils._checkYearInValidRange(iYear);
 
-		oCalDate = CalendarDate.fromLocalJSDate(oStartDate);
+		oCalDate = CalendarDate.fromLocalJSDate(oStartDate, this.getProperty("primaryCalendarType"));
 		this.setProperty("startDate", oStartDate, true);
 		this._oStartDate = oCalDate;
 		this._oStartDate.setDate(1); // always use begin of month as start date
@@ -323,7 +329,7 @@ sap.ui.define([
 	MonthsRow.prototype._getStartDate = function(){
 
 		if (!this._oStartDate) {
-			this._oStartDate = new CalendarDate();
+			this._oStartDate = CalendarDate.fromLocalJSDate(new Date(), this.getProperty("primaryCalendarType"));
 			this._oStartDate.setDate(1); // always use begin of month as start date
 		}
 
@@ -339,7 +345,7 @@ sap.ui.define([
 	 */
 	MonthsRow.prototype.displayDate = function(oDate){
 
-		_changeDate.call(this, CalendarDate.fromLocalJSDate(oDate), true);
+		_changeDate.call(this, CalendarDate.fromLocalJSDate(oDate, this.getProperty("primaryCalendarType")), true);
 
 		return this;
 
@@ -393,7 +399,7 @@ sap.ui.define([
 
 		if (this._oFormatLong.oLocale.toString() != sLocale) {
 			var oLocale = new Locale(sLocale);
-			this._oFormatLong = DateFormat.getInstance({style: "long"} , oLocale);
+			this._oFormatLong = DateFormat.getInstance({style: "long", calendarType: this.getProperty("primaryCalendarType")} , oLocale);
 		}
 
 		return this._oFormatLong;
@@ -550,6 +556,7 @@ sap.ui.define([
 			oTimeStamp,
 			oStartTimeStamp = 0, oEndTimeStamp = 0,
 			iSelected = 0,
+			sCalendarType = this.getProperty("primaryCalendarType"),
 			i,
 			aSelectedDates,
 			oMyDate;
@@ -567,14 +574,14 @@ sap.ui.define([
 			oStartDate = oRange.getStartDate();
 			oStartTimeStamp = 0;
 			if (oStartDate) {
-				oStartDate = CalendarDate.fromLocalJSDate(oStartDate);
+				oStartDate = CalendarDate.fromLocalJSDate(oStartDate, sCalendarType);
 				oStartDate.setDate(1); // begin of month
 				oStartTimeStamp = oStartDate.toUTCJSDate().getTime();
 			}
 			oEndDate = oRange.getEndDate();
 			oEndTimeStamp = 0;
 			if (oEndDate) {
-				oEndDate = CalendarDate.fromLocalJSDate(oEndDate);
+				oEndDate = CalendarDate.fromLocalJSDate(oEndDate, sCalendarType);
 				oEndDate.setDate(1); // begin of month
 				oEndTimeStamp = oEndDate.toUTCJSDate().getTime();
 			}
@@ -621,7 +628,8 @@ sap.ui.define([
 			oEndDate, oEndTimeStamp = 0,
 			oTimeStamp,
 			aSpecialDates = this.getSpecialDates(),
-			oMyDate = new CalendarDate(oDate);
+			oMyDate = new CalendarDate(oDate),
+			sCalendarType = this.getProperty("primaryCalendarType");
 
 		oMyDate.setDate(1); //always use begin of month for test
 		oTimeStamp = oMyDate.toUTCJSDate().getTime();
@@ -632,14 +640,14 @@ sap.ui.define([
 			oStartDate = oRange.getStartDate();
 			oStartTimeStamp = 0;
 			if (oStartDate) {
-				oStartDate = CalendarDate.fromLocalJSDate(oStartDate);
+				oStartDate = CalendarDate.fromLocalJSDate(oStartDate, sCalendarType);
 				oStartDate.setDate(1); // begin of month
 				oStartTimeStamp = oStartDate.toUTCJSDate().getTime();
 			}
 			oEndDate = oRange.getEndDate();
 			oEndTimeStamp = 0;
 			if (oEndDate) {
-				oEndDate = CalendarDate.fromLocalJSDate(oEndDate);
+				oEndDate = CalendarDate.fromLocalJSDate(oEndDate, sCalendarType);
 				oEndDate.setDate(CalendarUtils._daysInMonth(oEndDate));// end of the Month
 				oEndTimeStamp = oEndDate.toUTCJSDate().getTime();
 			}
@@ -692,7 +700,7 @@ sap.ui.define([
 
 		if ($Target.hasClass("sapUiCalItem")) {
 			var oOldFocusedDate = this._getDate();
-			var oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month")));
+			var oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month"), this.getProperty("primaryCalendarType")));
 			oFocusedDate.setDate(1);
 
 			if (!oFocusedDate.isSame(oOldFocusedDate)) {
@@ -730,7 +738,7 @@ sap.ui.define([
 				}
 
 				if ($Target.hasClass("sapUiCalItem")) {
-					oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month")));
+					oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month"), this.getProperty("primaryCalendarType")));
 					oFocusedDate.setDate(1);
 				}
 
@@ -828,7 +836,7 @@ sap.ui.define([
 		this._bNamesLengthChecked = undefined;
 		this._bLongWeekDays = undefined;
 		var oLocaleData = this._getLocaleData();
-		var aMonthNamesWide = oLocaleData.getMonthsStandAlone("wide");
+		var aMonthNamesWide = oLocaleData.getMonthsStandAlone("wide", this.getProperty("primaryCalendarType"));
 		var aMonths = this.$("months").children();
 		var iMonth = this._getStartDate().getMonth();
 		for (var i = 0; i < aMonths.length; i++) {
@@ -863,7 +871,7 @@ sap.ui.define([
 		var oEndDate = new CalendarDate(oStartDate);
 		oEndDate.setDate(1);
 		oEndDate.setMonth(oEndDate.getMonth() + this.getMonths());
-		var oCalDate = CalendarDate.fromLocalJSDate(oDateTime);
+		var oCalDate = CalendarDate.fromLocalJSDate(oDateTime, this.getProperty("primaryCalendarType"));
 
 		return oCalDate.isSameOrAfter(oStartDate) && oCalDate.isBefore(oEndDate);
 	};
@@ -936,7 +944,7 @@ sap.ui.define([
 		// find out what day was focused
 		var $DomRef = jQuery(aDomRefs[iIndex]);
 
-		oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($DomRef.attr("data-sap-month")));
+		oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($DomRef.attr("data-sap-month"), this.getProperty("primaryCalendarType")));
 		oFocusedDate.setDate(1);
 		this.setDate(oFocusedDate.toLocalJSDate());
 
@@ -1052,7 +1060,7 @@ sap.ui.define([
 		CalendarUtils._checkYearInValidRange(iYear);
 
 		var bFocusable = true; // if date not changed it is still focusable
-		if (!this.getDate() || !oDate.isSame(CalendarDate.fromLocalJSDate(this.getDate()))) {
+		if (!this.getDate() || !oDate.isSame(CalendarDate.fromLocalJSDate(this.getDate(), this.getProperty("primaryCalendarType")))) {
 			var oCalDate = new CalendarDate(oDate);
 			oCalDate.setDate(1); // always use begin of month
 			bFocusable = this.checkDateFocusable(oDate.toLocalJSDate());
@@ -1132,7 +1140,7 @@ sap.ui.define([
 				oDateRange = aSelectedDates[0];
 				oStartDate = oDateRange.getStartDate();
 				if (oStartDate) {
-					oStartDate = CalendarDate.fromLocalJSDate(oStartDate);
+					oStartDate = CalendarDate.fromLocalJSDate(oStartDate, this.getProperty("primaryCalendarType"));
 					oStartDate.setDate(1); // begin of month
 				}
 			} else {
@@ -1174,7 +1182,7 @@ sap.ui.define([
 					for ( i = 0; i < aSelectedDates.length; i++) {
 						oStartDate = aSelectedDates[i].getStartDate();
 						if (oStartDate) {
-							oStartDate = CalendarDate.fromLocalJSDate(oStartDate);
+							oStartDate = CalendarDate.fromLocalJSDate(oStartDate, this.getProperty("primaryCalendarType"));
 							oStartDate.setDate(1); // begin of month
 							if (oDate.isSame(oStartDate)) {
 								oAggOwner.removeAggregation("selectedDates", i);
@@ -1216,7 +1224,7 @@ sap.ui.define([
 			var iBlocks = Math.ceil(12 / iMonths);
 			var iMonth = 0;
 			var oLocaleData = this._getLocaleData();
-			var aMonthNamesWide = oLocaleData.getMonthsStandAlone("wide");
+			var aMonthNamesWide = oLocaleData.getMonthsStandAlone("wide", this.getProperty("primaryCalendarType"));
 			var $Month;
 
 			for (var b = 0; b < iBlocks; b++) {
@@ -1256,7 +1264,7 @@ sap.ui.define([
 			if (bTooLong) {
 				this._bLongMonth = false;
 				// change month name on button but not change month picker, because it is hided again
-				var aMonthNames = oLocaleData.getMonthsStandAlone("abbreviated");
+				var aMonthNames = oLocaleData.getMonthsStandAlone("abbreviated", this.getProperty("primaryCalendarType"));
 				iMonth = this._getStartDate().getMonth();
 				for (i = 0; i < aMonths.length; i++) {
 					$Month = jQuery(jQuery(aMonths[i]).children(".sapUiCalItemText"));

package/src/sap/ui/unified/calendar/MonthsRowRenderer.js

@@ -188,18 +188,19 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		CalendarUtils._checkCalendarDate(oDate);
 
 		var oHelper = {};
+		var sPrimaryCalendarType = oMonthsRow.getProperty("primaryCalendarType");
 
 		oHelper.sLocale = oMonthsRow._getLocale();
 		oHelper.oLocaleData = oMonthsRow._getLocaleData();
-		oHelper.oToday = new CalendarDate();
+		oHelper.oToday = CalendarDate.fromLocalJSDate(new Date(), sPrimaryCalendarType);
 		oHelper.sCurrentMonth = oMonthsRow._rb.getText("CALENDAR_CURRENT_MONTH");
 		oHelper.sId = oMonthsRow.getId();
 		oHelper.oFormatLong = oMonthsRow._getFormatLong();
 		if (oMonthsRow._bLongMonth || !oMonthsRow._bNamesLengthChecked) {
-			oHelper.aMonthNames = oHelper.oLocaleData.getMonthsStandAlone("wide");
+			oHelper.aMonthNames = oHelper.oLocaleData.getMonthsStandAlone("wide", sPrimaryCalendarType);
 		} else {
-			oHelper.aMonthNames = oHelper.oLocaleData.getMonthsStandAlone("abbreviated");
-			oHelper.aMonthNamesWide = oHelper.oLocaleData.getMonthsStandAlone("wide");
+			oHelper.aMonthNames = oHelper.oLocaleData.getMonthsStandAlone("abbreviated", sPrimaryCalendarType);
+			oHelper.aMonthNamesWide = oHelper.oLocaleData.getMonthsStandAlone("wide", sPrimaryCalendarType);
 		}
 
 

package/src/sap/ui/unified/calendar/OneMonthDatesRow.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * Other usages are not supported.
 	 *
 	 * @extends sap.ui.unified.calendar.DatesRow
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @private
@@ -115,7 +115,7 @@ sap.ui.define([
 		if (this.iMode === 2) {
 			return 31;
 		} else {
-			return CalendarUtils._daysInMonth(CalendarDate.fromLocalJSDate(this.getStartDate()));
+			return CalendarUtils._daysInMonth(CalendarDate.fromLocalJSDate(this.getStartDate(), this.getPrimaryCalendarType()));
 		}
 	};
 

package/src/sap/ui/unified/calendar/TimesRow.js

@@ -13,7 +13,6 @@ sap.ui.define([
 	'sap/ui/core/date/UniversalDate',
 	'sap/ui/unified/library',
 	'sap/ui/core/format/DateFormat',
-	'sap/ui/core/library',
 	'sap/ui/core/Locale',
 	"./TimesRowRenderer",
 	"sap/ui/dom/containsOrEquals",
@@ -29,7 +28,6 @@ sap.ui.define([
 	UniversalDate,
 	library,
 	DateFormat,
-	coreLibrary,
 	Locale,
 	TimesRowRenderer,
 	containsOrEquals,
@@ -40,9 +38,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// shortcut for sap.ui.core.CalendarType
-	var CalendarType = coreLibrary.CalendarType;
-
 	/*
 	 * <code>UniversalDate</code> objects are used inside the <code>TimesRow</code>, whereas JavaScript dates are used in the API.
 	 * This means that a conversion must be performed for the API functions.
@@ -64,7 +59,7 @@ sap.ui.define([
 	 *
 	 * The TimesRow works with JavaScript Date objects.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public
@@ -119,7 +114,15 @@ sap.ui.define([
 			/**
 			 * If set, a header with the years is shown to visualize what month belongs to what year.
 			 */
-			showHeader : {type : "boolean", group : "Appearance", defaultValue : false}
+			showHeader : {type : "boolean", group : "Appearance", defaultValue : false},
+
+			/**
+			 * If set, the calendar type is used for display.
+			 * If not set, the calendar type of the global configuration is used.
+			 * @private
+			 * @since 1.108.0
+			 */
+			primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null}
 		},
 		aggregations : {
 
@@ -177,9 +180,9 @@ sap.ui.define([
 
 	TimesRow.prototype.init = function(){
 
-		this._oFormatYyyyMMddHHmm = DateFormat.getInstance({pattern: "yyyyMMddHHmm", calendarType: CalendarType.Gregorian});
-		this._oFormatLong = DateFormat.getDateTimeInstance({style: "long/short"});
-		this._oFormatDate = DateFormat.getDateInstance({style: "medium"});
+		this._oFormatYyyyMMddHHmm = DateFormat.getInstance({pattern: "yyyyMMddHHmm", calendarType: this.getProperty("primaryCalendarType")});
+		this._oFormatLong = DateFormat.getDateTimeInstance({style: "long/short", calendarType: this.getProperty("primaryCalendarType")});
+		this._oFormatDate = DateFormat.getDateInstance({style: "medium", calendarType: this.getProperty("primaryCalendarType")});
 
 		this._mouseMoveProxy = jQuery.proxy(this._handleMouseMove, this);
 
@@ -390,7 +393,7 @@ sap.ui.define([
 
 		if (this._oFormatLong.oLocale.toString() != sLocale) {
 			var oLocale = new Locale(sLocale);
-			this._oFormatLong = DateFormat.getInstance({style: "long/short"}, oLocale);
+			this._oFormatLong = DateFormat.getInstance({style: "long/short", calendarType: this.getProperty("primaryCalendarType")}, oLocale);
 		}
 
 		return this._oFormatLong;
@@ -419,7 +422,7 @@ sap.ui.define([
 
 				if (sTimeFormatShort.search("a") >= 0) {
 					// AP/PM indicator used
-					this._oFormatTimeAmPm = DateFormat.getTimeInstance({pattern: "a"}, oLocale);
+					this._oFormatTimeAmPm = DateFormat.getTimeInstance({pattern: "a", calendarType: this.getProperty("primaryCalendarType")}, oLocale);
 				}
 			} else {
 				sPattern = sTimeFormatShort;
@@ -428,11 +431,11 @@ sap.ui.define([
 				sPattern = sPattern.replace("hh", "h");
 				if (sPattern.search("a") >= 0) {
 					// AP/PM indicator used
-					this._oFormatTimeAmPm = DateFormat.getTimeInstance({pattern: "a"}, oLocale);
+					this._oFormatTimeAmPm = DateFormat.getTimeInstance({pattern: "a", calendarType: this.getProperty("primaryCalendarType")}, oLocale);
 					sPattern = sPattern.replace("a", "").trim();
 				}
 			}
-			this._oFormatTime = DateFormat.getTimeInstance({pattern: sPattern}, oLocale);
+			this._oFormatTime = DateFormat.getTimeInstance({pattern: sPattern, calendarType: this.getProperty("primaryCalendarType")}, oLocale);
 		}
 
 		return this._oFormatTime;
@@ -448,7 +451,7 @@ sap.ui.define([
 
 		if (this._oFormatDate.oLocale.toString() != sLocale) {
 			var oLocale = new Locale(sLocale);
-			this._oFormatDate = DateFormat.getDateInstance({style: "medium"}, oLocale);
+			this._oFormatDate = DateFormat.getDateInstance({style: "medium", calendarType: this.getProperty("primaryCalendarType")}, oLocale);
 		}
 
 		return this._oFormatDate;

package/src/sap/ui/unified/calendar/YearPicker.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * As in all date-time controls, all pubic JS Date objects that are given (e.g. <code>setDate()</code>) or read
 	 * (e.g. <code>getFirstRenderedDate</code>) with values which are considered as date objects in browser(local) timezone.
 	 * @extends sap.ui.core.Control
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/YearRangePicker.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.calendar.YearPicker
 	 *
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/library.js

@@ -28,13 +28,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.unified
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.unified",
-		version: "1.107.1",
+		version: "1.108.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [