@openui5/sap.ui.unified 1.71.48 → 1.71.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.71.48",
+  "version": "1.71.52",
   "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.71.48"
+    "@openui5/sap.ui.core": "1.71.52"
   }
 }

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.71.48</version>
+  <version>1.71.52</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

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

@@ -26,7 +26,8 @@ sap.ui.define([
 	"sap/ui/dom/containsOrEquals",
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/date/CalendarWeekNumbering"
 ], function(
 	Control,
 	LocaleData,
@@ -49,13 +50,13 @@ sap.ui.define([
 	containsOrEquals,
 	deepEqual,
 	Log,
-	jQuery
+	jQuery,
+	CalendarWeekNumbering
 ) {
 	"use strict";
 
 	// get resource translation bundle;
 	var oCore = sap.ui.getCore(),
-		oLibraryResourceBundle = oCore.getLibraryResourceBundle("sap.ui.unified"),
 		CalendarType = sap.ui.core.CalendarType;
 	/*
 	 * Inside the Calendar CalendarDate objects are used. But in the API JS dates are used.
@@ -72,7 +73,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public
@@ -108,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},
@@ -182,7 +184,17 @@ sap.ui.define([
 			 * regardless of what is set to this property.
 			 * @since 1.48
 			 */
-			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true}
+			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true},
+
+			/**
+			 * 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.
+			 * Note: This API has been introduced with version 1.108 and downported to this release with
+			 * patch level 52.
+			 * @since 1.71.52
+			 */
+			calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 
 		},
 		aggregations : {
@@ -420,6 +432,7 @@ sap.ui.define([
 
 	Calendar.prototype._initilizeMonthPicker = function() {
 		var oMonthPicker = new MonthPicker(this.getId() + "--MP");
+		oMonthPicker._bCalendar = true;
 		oMonthPicker.attachEvent("select", this._selectMonth, this);
 		oMonthPicker.attachEvent("pageChange", _handleMonthPickerPageChange, this);
 		oMonthPicker._bNoThemeChange = true;
@@ -428,6 +441,7 @@ sap.ui.define([
 
 	Calendar.prototype._initilizeYearPicker = function() {
 		var oYearPicker = new YearPicker(this.getId() + "--YP");
+		oYearPicker._bCalendar = true;
 		oYearPicker.attachEvent("select", this._selectYear, this);
 		oYearPicker.attachEvent("pageChange", _handleYearPickerPageChange, this);
 		this.setAggregation("yearPicker",oYearPicker);
@@ -441,8 +455,9 @@ 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);
 
@@ -481,6 +496,10 @@ sap.ui.define([
 			oFocusedDate = this._getFocusedDate(),
 			oHeader = this.getAggregation("header");
 
+		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());
@@ -778,6 +797,18 @@ sap.ui.define([
 		this._bPopoverContainer = true;
 	};
 
+	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
@@ -797,6 +828,8 @@ sap.ui.define([
 				oMonth.attachEvent("_bindMousemove", _handleBindMousemove, this);
 				oMonth.attachEvent("_unbindMousemove", _handleUnbindMousemove, this);
 				oMonth._bNoThemeChange = true;
+				oMonth._bNotInTabChain = true;
+				oMonth.setCalendarWeekNumbering(this.getCalendarWeekNumbering());
 				oMonth.setSecondaryCalendarType(this._getSecondaryCalendarType());
 				this.addAggregation("month",oMonth);
 			}
@@ -2172,13 +2205,9 @@ sap.ui.define([
 			sAriaLabel = aMonthNamesWide[aMonths[0]] || sText;
 		}
 
-		if (!this._getSucessorsPickerPopup()) {
+		if (!this._getSucessorsPickerPopup() && sSecondaryMonthInfo) {
 			// Add info for the secondary month
-			if (sSecondaryMonthInfo) {
 				sAriaLabel += ", " + sSecondaryMonthInfo;
-			}
-
-			sAriaLabel += ". " + oLibraryResourceBundle.getText("CALENDAR_MONTH_PICKER_OPEN_HINT");
 		}
 
 		oHeader.setTextButton1(sText);
@@ -2511,11 +2540,6 @@ sap.ui.define([
 			sSecondHeaderText = sSecondHeaderYear || sFirstHeaderYear,
 			sPrimaryCalendarType = this.getPrimaryCalendarType();
 
-		if (!this._getSecondaryCalendarType()) {
-			// If secondary type is set, than placing the hint should be done in the end.
-			sFirstHeaderAriaLabel += (this._getSucessorsPickerPopup() ? "" : ". " + oLibraryResourceBundle.getText("CALENDAR_YEAR_PICKER_OPEN_HINT"));
-		}
-
 		if (this._iMode === 2 && oYearPicker && oYearPicker.getDomRef()) {
 
 			var aYearPickerCells = oYearPicker._oItemNavigation.getItemDomRefs(),
@@ -2552,7 +2576,7 @@ sap.ui.define([
 		if (sYear) {
 			// Add the secondary year info, as well as the hint.
 			// Keep in mind this method might be called from _handleNext/Previous without a year
-			sAriaLabel += ", " + sYear + (this._getSucessorsPickerPopup() ? "" : ". " + oLibraryResourceBundle.getText("CALENDAR_YEAR_PICKER_OPEN_HINT"));
+			sAriaLabel += ", " + sYear ;
 			oHeader.setAriaLabelButton2(sAriaLabel);
 		}
 
@@ -2746,9 +2770,6 @@ sap.ui.define([
 				this._setPrimaryHeaderMonthButtonText();
 				this._toggleTwoMonthsInTwoColumnsCSS();
 			}
-		} else if (_getMonths.call(this) > 1) {
-			// on rerendering focus might be set on wrong month
-			this._focusDate(this._getFocusedDate(), true, true);
 		}
 
 	}

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

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

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

@@ -55,7 +55,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+		 * @version 1.71.52
 		 *
 		 * @constructor
 		 * @private

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

@@ -71,7 +71,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+		 * @version 1.71.52
 		 *
 		 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+		 * @version 1.71.52
 		 *
 		 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -54,7 +54,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.71.48
+		 * @version 1.71.52
 		 *
 		 * @constructor
 		 * @public

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

@@ -14,7 +14,7 @@ sap.ui.define([],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+		 * @version 1.71.52
 		 *
 		 * @constructor
 		 * @since 1.52

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 * @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'],
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 * @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.71.48
+	 * @version 1.71.52
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

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

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

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

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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,10 @@ sap.ui.define([
 	"./MonthRenderer",
 	"sap/ui/dom/containsOrEquals",
 	"sap/ui/events/KeyCodes",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/date/CalendarWeekNumbering",
+	"sap/ui/core/date/CalendarUtils",
+	"sap/base/Log"
 ], function(
 	Control,
 	Device,
@@ -36,7 +39,10 @@ sap.ui.define([
 	MonthRenderer,
 	containsOrEquals,
 	KeyCodes,
-	jQuery
+	jQuery,
+	CalendarWeekNumbering,
+	CalendarDateUtils,
+	Log
 ) {
 	"use strict";
 
@@ -63,7 +69,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public
@@ -97,8 +103,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},
@@ -138,7 +145,17 @@ sap.ui.define([
 			 * regardless of what is set to this property.
 			 * @since 1.48
 			 */
-			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true}
+			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true},
+
+			/**
+			 * 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.
+			 * Note: This API has been introduced with version 1.108 and downported to this release with
+			 * patch level 52.
+			 * @since 1.71.52
+			 */
+			 calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 
 		},
 		aggregations : {
@@ -280,6 +297,12 @@ sap.ui.define([
 		return 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(){
 
 		_initItemNavigation.call(this);
@@ -729,8 +752,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;
@@ -1601,6 +1630,37 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+
+	 * Calculates week number.
+	 *
+	 * @param {sap.ui.unified.calendar.CalendarDate} oDate Start date of the week
+	 * @returns {int} Week number
+	 * @private
+	 */
+	Month.prototype._calculateWeekNumber = function (oDate) {
+		var oLocale = new Locale(this._getLocale());
+		var oEndDate = this._getLastWeekDate(oDate);
+		var oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(this.getCalendarWeekNumbering(), oLocale);
+		var oDateFormat;
+		var iWeekNumber;
+
+		oDateFormat = DateFormat.getInstance({pattern: "w", calendarType: this.getPrimaryCalendarType(), calendarWeekNumbering: this.getCalendarWeekNumbering()}, oLocale);
+
+		var bIsRegionUS = oWeekConfigurationValues.firstDayOfWeek === 0;
+
+		// 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 {
+			iWeekNumber = oDateFormat.format(oDate.toUTCJSDate(), true);
+		}
+
+		return iWeekNumber;
+	};
+
 	/**
 	 * Determines if week selection is allowed.
 	 * @returns {boolean} Week selection is allowed

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

@@ -36,7 +36,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define([],
-	function() {
+sap.ui.define(['sap/ui/core/InvisibleText'],
+	function(InvisibleText) {
 	"use strict";
 
 
@@ -55,7 +55,10 @@ sap.ui.define([],
 		oRm.writeAccessibilityState(oMP, {
 			role: "grid",
 			readonly: "true",
-			multiselectable: "false"
+			multiselectable: "false",
+			describedby: oMP._bCalendar
+				? InvisibleText.getStaticId("sap.ui.unified", "CALENDAR_YEAR_PICKER_OPEN_HINT")
+				: ""
 		});
 
 		oRm.write(">"); // div element

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

@@ -65,7 +65,12 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		oRm.writeAccessibilityState(oMonth, {
 			role: "grid",
 			multiselectable: !oMonth.getSingleSelection() || oMonth.getIntervalSelection(),
-			labelledby: oAriaLabel
+			labelledby: oAriaLabel,
+			describedby: oMonth._bCalendar
+				? InvisibleText.getStaticId("sap.ui.unified", "CALENDAR_MONTH_PICKER_OPEN_HINT")
+					+ " "
+					+ InvisibleText.getStaticId("sap.ui.unified", "CALENDAR_YEAR_PICKER_OPEN_HINT")
+				: ""
 		});
 
 		oRm.write(">"); // div element
@@ -217,7 +222,11 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 			if (sWidth) {
 				oRm.addStyle("width", sWidth);
 			}
-			oRm.writeAccessibilityState(null, {role: "columnheader", label: aWeekDaysWide[(i + iStartDay) % 7]});
+			oRm.writeAccessibilityState(null, {
+				role: "columnheader",
+				label: aWeekDaysWide[(i + iStartDay) % 7],
+				hidden: true
+			});
 			oRm.writeClasses();
 			oRm.writeStyles();
 			oRm.write(">"); // div element

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

@@ -61,7 +61,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @private

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

@@ -62,7 +62,7 @@ sap.ui.define([
 	 *
 	 * The TimesRow works with JavaScript Date objects.
 	 * @extends sap.ui.core.Control
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -54,7 +54,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.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @public

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/unified/calendar/CalendarDate', 'sap/ui/core/date/UniversalDate'],
-	function(CalendarDate, UniversalDate) {
+sap.ui.define(['sap/ui/unified/calendar/CalendarDate', 'sap/ui/core/date/UniversalDate', 'sap/ui/core/InvisibleText'],
+	function(CalendarDate, UniversalDate, InvisibleText) {
 	"use strict";
 
 	/*
@@ -48,7 +48,10 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarDate', 'sap/ui/core/date/Univers
 		oRm.writeAccessibilityState(oYP, {
 			role: "grid",
 			readonly: "true",
-			multiselectable: "false"
+			multiselectable: "false",
+			describedby: oYP._bCalendar
+				? InvisibleText.getStaticId("sap.ui.unified", "CALENDAR_YEAR_RANGE_PICKER_OPEN_HINT")
+				: ""
 		});
 
 		oRm.write(">"); // div element

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.calendar.YearPicker
 	 *
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 *
 	 * @constructor
 	 * @private

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

@@ -14,7 +14,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/base/Object', "./ColorPickerDisplayMo
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : "sap.ui.unified",
-		version: "1.71.48",
+		version: "1.71.52",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [
@@ -83,7 +83,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/base/Object', "./ColorPickerDisplayMo
 	 * @namespace
 	 * @alias sap.ui.unified
 	 * @author SAP SE
-	 * @version 1.71.48
+	 * @version 1.71.52
 	 * @public
 	 */
 	var thisLib = sap.ui.unified;

package/src/sap/ui/unified/messagebundle.properties

@@ -58,6 +58,9 @@ CALENDAR_MONTH_PICKER_OPEN_HINT = Press F4 to select a month
 #XACT
 CALENDAR_YEAR_PICKER_OPEN_HINT = Press Shift + F4 to select an year
 
+#XACT
+CALENDAR_YEAR_RANGE_PICKER_OPEN_HINT= Press Shift + F4 to select an year range
+
 #XACT: Aria information for appointment
 APPOINTMENT=Appointment
 

package/src/sap/ui/unified/messagebundle_bg.properties

@@ -32,7 +32,7 @@ CALENDAR_END_MONTH=\u041A\u0440\u0430\u0435\u043D \u043C\u0435\u0441\u0435\u0446
 CALENDAR_CURRENT_MONTH=\u0422\u0435\u043A\u0443\u0449 \u043C\u0435\u0441\u0435\u0446
 
 #XACT: Aria information for start time
-CALENDAR_START_TIME=\u0412\u0440\u0435\u043C\u0435 \u043D\u0430 \u0437\u0430\u043F\u043E\u0447\u0432\u0430\u043D\u0435
+CALENDAR_START_TIME=\u041D\u0430\u0447\u0430\u043B\u0435\u043D \u0447\u0430\u0441
 
 #XACT: Aria information for end time
 CALENDAR_END_TIME=\u041A\u0440\u0430\u0435\u043D \u0447\u0430\u0441
@@ -44,10 +44,10 @@ CALENDAR_CURRENT_TIME=\u0421\u0435\u0433\u0430
 CALENDAR_CANCEL=\u041E\u0442\u043A\u0430\u0437
 
 #XACT
-CALENDAR_BTN_PREV=\u041F\u0440\u0435\u0434\u0445\u043E\u0434\u0435\u043D
+CALENDAR_BTN_PREV=\u041D\u0430\u0437\u0430\u0434
 
 #XACT
-CALENDAR_BTN_NEXT=\u0421\u043B\u0435\u0434\u0432\u0430\u0449
+CALENDAR_BTN_NEXT=\u041D\u0430\u043F\u0440\u0435\u0434
 
 #XFLD: Text for a week in week numbers row
 CALENDAR_DATES_ROW_WEEK_NUMBER=\u0421\u0435\u0434\u043C\u0438\u0446\u0430 {0}
@@ -59,10 +59,10 @@ CALENDAR_MONTH_PICKER_OPEN_HINT=\u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442
 CALENDAR_YEAR_PICKER_OPEN_HINT=\u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442\u0435 Shift + F4, \u0437\u0430 \u0434\u0430 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0433\u043E\u0434\u0438\u043D\u0430
 
 #XACT: Aria information for appointment
-APPOINTMENT=\u0421\u0440\u0435\u0449\u0430
+APPOINTMENT=\u041D\u0430\u0441\u0440\u043E\u0447\u0435\u043D \u0447\u0430\u0441
 
 #XACT: Aria information for tentative appointment
-APPOINTMENT_TENTATIVE=\u0421 \u0440\u0435\u0437\u0435\u0440\u0432\u0438
+APPOINTMENT_TENTATIVE=\u041D\u0435\u043E\u043A\u043E\u043D\u0447\u0430\u0442\u0435\u043B\u043D\u043E
 
 #XBUT: File Uploader - browse button text
 FILEUPLOAD_BROWSE=\u041F\u0440\u0435\u0433\u043B\u0435\u0434...
@@ -86,7 +86,7 @@ LEGEND_NON_WORKING_DAY=\u041D\u0435\u0440\u0430\u0431\u043E\u0442\u0435\u043D \u
 LEGEND_UNNAMED_TYPE=\u0412\u0438\u0434 {0}
 
 #XACT: Aria information for selected appointment
-APPOINTMENT_SELECTED=\u0418\u0437\u0431\u0440\u0430\u043D
+APPOINTMENT_SELECTED=\u0418\u0437\u0431\u0440\u0430\u043D\u043E
 
 #XTOL: Red color for the ColorPicker control
 COLORPICKER_RED=\u0427\u0435\u0440\u0432\u0435\u043D

package/src/sap/ui/unified/messagebundle_es.properties

@@ -59,13 +59,13 @@ CALENDAR_MONTH_PICKER_OPEN_HINT=Pulse F4 para seleccionar un mes
 CALENDAR_YEAR_PICKER_OPEN_HINT=Pulse May\u00FAs + F4 para seleccionar un a\u00F1o
 
 #XACT: Aria information for appointment
-APPOINTMENT=Fecha
+APPOINTMENT=Cita
 
 #XACT: Aria information for tentative appointment
 APPOINTMENT_TENTATIVE=Con reservas
 
 #XBUT: File Uploader - browse button text
-FILEUPLOAD_BROWSE=Navegar...
+FILEUPLOAD_BROWSE=Explorar...
 
 #XACT: File Uploader - ARIA text
 FILEUPLOAD_ACC=Activar para seleccionar un archivo
@@ -116,7 +116,7 @@ COLORPICKER_ALPHA=Alfa
 COLORPICKER_LIGHTNESS=Luminosidad
 
 #XTOL: Describing two boxes one containing the old color and one containing the target color that will replace the one in the old color box
-COLORPICKER_NEW_OLD_COLOR=El color original se sustituye con el color nuevo en la direcci\u00F3n de la flecha
+COLORPICKER_NEW_OLD_COLOR=El color original se sustituye por el color nuevo en la direcci\u00F3n de la flecha
 
 #XACT: Aria information for the ColorPicker Alpha slider
 COLORPICKER_ALPHA_SLIDER=Control alfa

package/src/sap/ui/unified/messagebundle_hr.properties

@@ -44,10 +44,10 @@ CALENDAR_CURRENT_TIME=Sada
 CALENDAR_CANCEL=Otka\u017Ei
 
 #XACT
-CALENDAR_BTN_PREV=Prethodni
+CALENDAR_BTN_PREV=Prethodno
 
 #XACT
-CALENDAR_BTN_NEXT=Sljede\u0107i
+CALENDAR_BTN_NEXT=Sljede\u0107e
 
 #XFLD: Text for a week in week numbers row
 CALENDAR_DATES_ROW_WEEK_NUMBER=Tjedan {0}