@openui5/sap.ui.core 1.112.2 → 1.114.0

package/src/sap/ui/core/format/DateFormat.js

@@ -6,35 +6,22 @@
 
 // Provides class sap.ui.core.format.DateFormat
 sap.ui.define([
-	'sap/ui/core/CalendarType',
-	'sap/ui/core/Locale',
-	'sap/ui/core/LocaleData',
-	'sap/ui/core/date/UI5Date',
-	'sap/ui/core/date/UniversalDate',
-	'sap/ui/core/date/CalendarUtils',
-	'sap/ui/core/date/CalendarWeekNumbering',
-	'sap/ui/core/format/TimezoneUtil',
-	"sap/base/util/deepEqual",
-	"sap/base/strings/formatMessage",
 	"sap/base/Log",
+	"sap/base/strings/formatMessage",
+	"sap/base/util/deepEqual",
 	"sap/base/util/extend",
-	"sap/ui/core/Configuration"
-],
-	function(
-		CalendarType,
-		Locale,
-		LocaleData,
-		UI5Date,
-		UniversalDate,
-		CalendarUtils,
-		CalendarWeekNumbering,
-		TimezoneUtil,
-		deepEqual,
-		formatMessage,
-		Log,
-		extend,
-		Configuration
-	) {
+	"sap/ui/core/CalendarType",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Core",
+	"sap/ui/core/Locale",
+	"sap/ui/core/LocaleData",
+	"sap/ui/core/date/CalendarUtils",
+	"sap/ui/core/date/CalendarWeekNumbering",
+	"sap/ui/core/date/UI5Date",
+	"sap/ui/core/date/UniversalDate",
+	"sap/ui/core/format/TimezoneUtil"
+], function(Log, formatMessage, deepEqual, extend, CalendarType, Configuration, Core, Locale,
+		LocaleData, CalendarUtils, CalendarWeekNumbering, UI5Date, UniversalDate, TimezoneUtil) {
 	"use strict";
 
 	/**
@@ -250,6 +237,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "Jan 10, 2008...Feb 12, 2008".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "Jan 10 – Feb 12, 2008" becomes "Jan 10, 2008...Feb 12, 2008".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the date is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -288,6 +281,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "Jan 10, 2008, 9:15:00 AM...Jan 10, 2008, 11:45:00 AM".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "Jan 10, 2008, 9:15 – 11:45 AM" becomes "Jan 10, 2008, 9:15 AM...Jan 10, 2008, 11:45 AM".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the date is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -324,7 +323,7 @@ sap.ui.define([
 	 * Format a date object to a string according to the given timezone and format options.
 	 *
 	 * @example <caption>Format option showTimezone: true (default)</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 *
 	 * DateFormat.getDateTimeWithTimezoneInstance().format(oDate, "Europe/Berlin");
 	 * // output: "Dec 24, 2021, 2:37:00 PM Europe, Berlin"
@@ -333,12 +332,12 @@ sap.ui.define([
 	 * // output: "Dec 24, 2021, 8:37:00 AM Americas, New York"
 	 *
 	 * @example <caption>Format option showTimezone: false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showTimezone: false}).format(oDate, "America/New_York");
 	 * // output: "Dec 24, 2021, 8:37:00 AM"
 	 *
 	 * @example <caption>Format option showDate: false and showTime:false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showDate: false, showTime: false}).format(oDate, "America/New_York");
 	 * // output: "Americas, New York"
 	 *
@@ -359,7 +358,7 @@ sap.ui.define([
 	 * containing a date object and the timezone.
 	 *
 	 * @example <caption>Format option showTimezone: true (default)</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 *
 	 * DateFormat.getDateTimeWithTimezoneInstance().parse("Dec 24, 2021, 2:37:00 PM Europe, Berlin", "Europe/Berlin");
 	 * // output: [oDate, "Europe/Berlin"]
@@ -368,7 +367,7 @@ sap.ui.define([
 	 * // output: [oDate, "America/New_York"]
 	 *
 	 * @example <caption>Format option showTimezone: false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showTimezone: false}).parse("Dec 24, 2021, 8:37:00 AM", "America/New_York");
 	 * // output: [oDate, undefined]
 	 *
@@ -394,9 +393,12 @@ sap.ui.define([
 	 * <ul>
 	 *   <li>An array containing datetime and timezone depending on the showDate, showTime and showTimezone options
 	 *     <ul>
-	 *         <li>(Default): [Date, string], e.g. [new Date("2021-11-13T13:22:33Z"), "America/New_York"]</li>
-	 *         <li><code>showTimezone: false</code>: [Date, undefined], e.g. [new Date("2021-11-13T13:22:33Z"), undefined]</li>
-	 *         <li><code>showDate: false, showTime: false</code>: [undefined, string], e.g. [undefined, "America/New_York"]</li>
+	 *         <li>(Default): [Date, string], e.g.
+	 *           [UI5Date.getInstance("2021-11-13T13:22:33Z"), "America/New_York"]</li>
+	 *         <li><code>showTimezone: false</code>: [Date, undefined], e.g.
+	 *           [UI5Date.getInstance("2021-11-13T13:22:33Z"), undefined]</li>
+	 *         <li><code>showDate: false, showTime: false</code>: [undefined, string], e.g.
+	 *           [undefined, "America/New_York"]</li>
 	 *     </ul>
 	 *   </li>
 	 * </ul>
@@ -406,6 +408,8 @@ sap.ui.define([
 	 * @function
 	 * @since 1.99
 	 */
+	// This method has a TypeScript specific overlay for a better return value documentation,
+	// see 'src/sap.ui.core/.dtsgenrc'
 
 	/**
 	 * Get a datetimeWithTimezone instance of the DateFormat, which can be used for formatting.
@@ -493,6 +497,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "09:15 AM...11:45 AM".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "09:15 – 11:45 AM" becomes "9:15 AM...11:45 AM".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the time is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -595,6 +605,8 @@ sap.ui.define([
 		}
 
 		if (oFormat.oFormatOptions.interval) {
+			var sSinglePattern,
+				sDelimiter = oFormat.oFormatOptions.intervalDelimiter;
 
 			if (oFormat.oFormatOptions.format) {
 				// when 'format' option is set, generate the pattern based on the greatest difference
@@ -605,10 +617,14 @@ sap.ui.define([
 					oFormat.intervalPatterns = [oFormat.intervalPatterns];
 				}
 
-				// Put the single date pattern, which is generated based on the oFormatOptions.format, into the array in case the date interval is formatted as a single date
-				oFormat.intervalPatterns.push(oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType));
+				sSinglePattern = oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format,
+					oFormat.oFormatOptions.calendarType);
+				// Put the single date pattern, which is generated based on the oFormatOptions.format, into the array in
+				// case the date interval is formatted as a single date
+				oFormat.intervalPatterns.push(sSinglePattern);
 
 			} else {
+				sSinglePattern = oFormat.oFormatOptions.pattern;
 				oFormat.intervalPatterns = [
 					// when 'format' option is not set, generate the combined interval pattern
 					oFormat.oLocaleData.getCombinedIntervalPattern(oFormat.oFormatOptions.pattern, oFormat.oFormatOptions.calendarType),
@@ -618,6 +634,12 @@ sap.ui.define([
 			}
 			var sCommonConnectorPattern = createIntervalPatternWithNormalConnector(oFormat);
 			oFormat.intervalPatterns.push(sCommonConnectorPattern);
+			if (sDelimiter) { // use delimiter pattern as first choice
+				sDelimiter = sDelimiter.replace(/'/g, "''");
+				sDelimiter = "'" + sDelimiter + "'";
+				oFormat.intervalPatterns.unshift(sSinglePattern + sDelimiter + sSinglePattern);
+			}
+			oFormat.intervalPatterns = Array.from(new Set(oFormat.intervalPatterns));
 		}
 
 		// if the current format isn't a fallback format, create its fallback formats
@@ -2302,10 +2324,10 @@ sap.ui.define([
 	 * browser's local timezone to convert the given date.
 	 *
 	 * When using instances from getDateTimeWithTimezoneInstance, please see the corresponding documentation:
-	 * {@link sap.ui.core.format.DateFormat.getDateTimeWithTimezoneInstance#format}.
+	 * {@link sap.ui.core.format.DateFormat.DateTimeWithTimezone#format}.
 	 *
 	 * @example <caption>DateTime (assuming timezone "Europe/Berlin")</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeInstance().format(oDate);
 	 * // output: "Dec 24, 2021, 2:37:00 PM"
 	 *
@@ -2399,27 +2421,55 @@ sap.ui.define([
 		return sResult;
 	};
 
-	DateFormat.prototype._formatInterval = function(aJSDates, bUTC) {
-		var sCalendarType = this.oFormatOptions.calendarType;
-		var oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType);
-		var oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType);
-		var oDate;
-		var oPart;
-		var sSymbol;
-		var aBuffer = [];
-		var sPattern;
-		var aFormatArray = [];
+	/**
+	 * Checks whether the interval to be formatted has to use the pattern of a custom interval delimiter.
+	 *
+	 * @param {object} oDiffFields
+	 *   An object describing which date information is required for this instance's interval format,
+	 *   for example <code>{"Day": true, "Minutes": true}</code>
+	 * @returns {boolean}
+	 *   Whether to use the custom interval delimiter pattern
+	 *
+	 * @private
+	 */
+	DateFormat.prototype._useCustomIntervalDelimiter = function (oDiffFields) {
+		var aTokens;
+
+		if (!this.oFormatOptions.intervalDelimiter) {
+			return false;
+		}
+		// If there are no differences in the date/time parts specified by "oFormatOptions.format", a single value is
+		// formatted and there is no need to use the custom delimiter pattern.
+		if (this.oFormatOptions.format) {
+			aTokens = this.oLocaleData._parseSkeletonFormat(this.oFormatOptions.format);
 
-		var oDiffField = this._getGreatestDiffField([oFromDate, oToDate]);
+			return aTokens.some(function (oToken) {
+				return oDiffFields[oToken.group];
+			});
+		}
+
+		return true;
+	};
 
-		if (!oDiffField) {
+	DateFormat.prototype._formatInterval = function(aJSDates, bUTC) {
+		var oDate, oPart, sPattern, sSymbol,
+			aBuffer = [],
+			sCalendarType = this.oFormatOptions.calendarType,
+			aFormatArray = [],
+			oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType),
+			oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType),
+			oDiffFields = this._getDiffFields([oFromDate, oToDate]);
+
+		if (!oDiffFields) {
 			return this._format(aJSDates[0], bUTC);
 		}
 
-		if (this.oFormatOptions.format) {
+		if (this._useCustomIntervalDelimiter(oDiffFields)) {
+			sPattern = this.intervalPatterns[0];
+		} else if (this.oFormatOptions.format) {
 			// when 'format' option is set, generate the pattern based on the greatest difference
-			sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffField, sCalendarType);
-
+			sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffFields,
+				sCalendarType);
 		} else {
 			sPattern = this.oLocaleData.getCombinedIntervalPattern(this.oFormatOptions.pattern, sCalendarType);
 		}
@@ -2454,8 +2504,18 @@ sap.ui.define([
 		Seconds: "Second"
 	};
 
-	// the expected dates are UTC and therefore their UTC functions are called, e.g. getUTCHours
-	DateFormat.prototype._getGreatestDiffField = function(aDates) {
+	/**
+	 * Returns an object containing the relevant date/time parts that differ in the two given dates.
+	 *
+	 * @param {sap.ui.core.date.UniversalDate[]} aDates
+	 *   An array with two UniversalDate instances representing the start and the end date of the interval;
+	 *   the dates are expected to be in UTC time zone
+	 * @returns {Object<string, boolean>|null}
+	 *   An object containing the different date/time parts, or <code>null</code> if the dates are the same
+	 *
+	 * @private
+	 */
+	DateFormat.prototype._getDiffFields = function(aDates) {
 		var bDiffFound = false,
 			mDiff = {};
 
@@ -2709,7 +2769,7 @@ sap.ui.define([
 		}
 		if (oDateValue.tzDiff) {
 			// tzDiff is in seconds for a higher precision (historical timezone might have differences in seconds)
-			// e.g. new Date(Date.UTC(1730, 0, 1))
+			// e.g. UI5Date.getInstance("1730-01-01T00:00:00Z")
 			// is in Berlin: Sun Jan 01 1730 00:53:28 GMT+0053 (Central European Standard Time)
 			oDate.setUTCSeconds(oDate.getUTCSeconds() + oDateValue.tzDiff);
 		}
@@ -2761,10 +2821,10 @@ sap.ui.define([
 	 * browser's local timezone to convert the given date.
 	 *
 	 * When using instances from getDateTimeWithTimezoneInstance, please see the corresponding documentation:
-	 * {@link sap.ui.core.format.DateFormat.getDateTimeWithTimezoneInstance#parse}.
+	 * {@link sap.ui.core.format.DateFormat.DateTimeWithTimezone#parse}.
 	 *
 	 * @example <caption>DateTime (assuming timezone "Europe/Berlin")</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeInstance().parse("Dec 24, 2021, 2:37:00 PM");
 	 * // output: oDate
 	 *
@@ -3363,6 +3423,53 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Returns a language-dependent placeholder text according to this instance's format options, for example
+	 * "e.g. 12/31/2023".
+	 *
+	 * @returns {string} The language-dependent placeholder text
+	 *
+	 * @private
+	 * @ui5-restricted sap.m
+	 */
+	DateFormat.prototype.getPlaceholderText = function() {
+		var oResourceBundle = Core.getLibraryResourceBundle();
+
+		return oResourceBundle.getText("date.placeholder", [this.format.apply(this, this.getSampleValue())]);
+	};
+
+	/**
+	 * Returns a sample date value.
+	 *
+	 * @returns {array}
+	 *   A sample date value as an array of parameter values as expected by {@link #format}
+	 *
+	 * @private
+	 */
+	DateFormat.prototype.getSampleValue = function() {
+		var oDate,
+			iFullYear = UI5Date.getInstance().getFullYear(),
+			bUTC = this.oFormatOptions.UTC;
+
+		function getDate(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds) {
+			return bUTC
+				? UI5Date.getInstance(Date.UTC(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds))
+				: UI5Date.getInstance(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds);
+		}
+
+		oDate = getDate(iFullYear, 11, 31, 23, 59, 58, 123);
+
+		if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+			return [oDate, Configuration.getTimezone()];
+		}
+
+		if (this.oFormatOptions.interval) {
+			return [[getDate(iFullYear, 11, 22, 9, 12, 34, 567), oDate]];
+		}
+
+		return [oDate];
+	};
+
 	return DateFormat;
 
 }, /* bExport= */ true);

package/src/sap/ui/core/format/NumberFormat.js

@@ -1479,7 +1479,9 @@ sap.ui.define([
 
 		if (oOptions.type === mNumberType.UNIT && !oOptions.showNumber) {
 			if (mUnitPatterns) {
-				sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+				// the plural category of a unit pattern is determined for the complete number, maybe as compact
+				// notation, e.g. "1.2M" must check "1.2c6"
+				sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart, oShortFormat);
 
 				sPattern = mUnitPatterns["unitPattern-count-" + sPluralCategory];
 				if (!sPattern) {
@@ -1525,7 +1527,9 @@ sap.ui.define([
 
 		if (oShortFormat && oShortFormat.formatString && oOptions.showScale && oOptions.type !== mNumberType.CURRENCY) {
 			// Get correct format string based on actual decimal/fraction digits
-			sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+			// the plural category of a compact number is determined for the reduced short number without compact
+			// notation, e.g. "1.2M" must check "1.2" (see CLDR "decimalFormat-short" and "decimalFormat-long")
+			sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart);
 			oShortFormat.formatString = this.oLocaleData.getDecimalFormat(oOptions.style, oShortFormat.key, sPluralCategory);
 			//inject formatted shortValue in the formatString
 			sResult = oShortFormat.formatString.replace(oShortFormat.valueSubString, sResult);
@@ -1548,7 +1552,9 @@ sap.ui.define([
 				}
 
 				// Get correct format string based on actual decimal/fraction digits
-				sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+				// the plural category of a compact currency is determined for the reduced short number without compact
+				// notation, e.g. "1.2M" must check "1.2" (see CLDR "currencyFormat-short")
+				sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart);
 				if (bIndianCurrency) {
 					sPattern = getIndianCurrencyFormat(sStyle, oShortFormat.key, sPluralCategory);
 				} else {
@@ -1602,8 +1608,9 @@ sap.ui.define([
 		}
 
 		if (oOptions.showMeasure && sMeasure && oOptions.type === mNumberType.UNIT) {
-
-			sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+			// the plural category of a unit pattern is determined for the complete number, maybe as compact
+			// notation, e.g. "1.2M" must check "1.2c6"
+			sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart, oShortFormat);
 
 			if (mUnitPatterns) {
 				sPattern = mUnitPatterns["unitPattern-count-" + sPluralCategory];
@@ -1622,6 +1629,34 @@ sap.ui.define([
 		return this._addOriginInfo(sResult);
 	};
 
+	/**
+	 * Gets the plural category for the given number information. With a given <code>oShortFormat</code>
+	 * the category is determined based on the compact notation.
+	 *
+	 * @param {int} sIntegerPart
+	 *   The integer part
+	 * @param {int} [sFractionPart]
+	 *   The fraction part
+	 * @param {{magnitude: int}} [oShortFormat]
+	 *   An object containing the <code>magnitude</code> information describing the factor of a compact number
+	 * @returns {string}
+	 *   The plural category
+	 *
+	 * @private
+	 */
+	NumberFormat.prototype._getPluralCategory = function (sIntegerPart, sFractionPart, oShortFormat) {
+		var sNumber = sIntegerPart;
+
+		if (sFractionPart) {
+			sNumber += "." + sFractionPart;
+		}
+		if (oShortFormat) {
+			sNumber += "c" + oShortFormat.magnitude.toExponential().slice(2);
+		}
+
+		return this.oLocaleData.getPluralCategory(sNumber);
+	};
+
 	NumberFormat.prototype._addOriginInfo = function(sResult) {
 		if (Configuration.getOriginInfo()) {
 			// String object is created on purpose and must not be a string literal

package/src/sap/ui/core/format/TimezoneUtil.js

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * Static collection of utility functions to handle time zone related conversions
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 * @namespace
 	 * @alias sap.ui.core.format.TimezoneUtil
 	 * @private

package/src/sap/ui/core/hyphenation/Hyphenation.js

@@ -400,7 +400,7 @@ sap.ui.define([
 	 * @see {@link topic:6322164936f047de941ec522b95d7b70 Hyphenation for Text Controls}
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 * @hideconstructor
 	 * @public
 	 * @since 1.60

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

@@ -25,13 +25,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.core
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 * @since 0.8
 	 * @public
 	 */
 	 var thisLib = Library.init({
 		 name: "sap.ui.core",
-		 version: "1.112.2",
+		 version: "1.114.0",
 		 designtime: "sap/ui/core/designtime/library.designtime",
 		 types: [
 
@@ -1539,7 +1539,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column.
 	 *
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 * @enum {string}
 	 * @public
 	 * @since 1.61.0

package/src/sap/ui/core/message/ControlMessageProcessor.js

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/core/message/MessageProcessor'],
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.ControlMessageProcessor

package/src/sap/ui/core/message/Message.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @param {object} [mParameters] a map which contains the following parameter properties:
 	 * @param {string} [mParameters.id] The message id: will be generated if no id is set

package/src/sap/ui/core/message/MessageManager.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageManager

package/src/sap/ui/core/message/MessageParser.js

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/Log"],
  * @extends sap.ui.base.Object
  *
  * @author SAP SE
- * @version 1.112.2
+ * @version 1.114.0
  * @public
  * @abstract
  * @alias sap.ui.core.message.MessageParser

package/src/sap/ui/core/message/MessageProcessor.js

@@ -27,7 +27,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/util/uid"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageProcessor

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

@@ -45,6 +45,8 @@ BUSY_VALUE_TEXT=Busy
 date.week.calendarweek.wide=Calendar Week {0}
 #XTXT: the short pattern for formatting a date using calendar week number
 date.week.calendarweek.narrow=CW {0}
+#XTXT: Placeholder text for input control with a sample value such as date or time
+date.placeholder=e.g. {0}
 
 #########
 # Texts for sap.ui.core.format.FileSizeFormat

package/src/sap/ui/core/messagebundle_ar.properties

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=\u0645\u0634\u063A\u0648\u0644
 
 date.week.calendarweek.wide=\u0623\u0633\u0628\u0648\u0639 \u0627\u0644\u062A\u0642\u0648\u064A\u0645 {0}
 date.week.calendarweek.narrow=\u0623\u0633\u0628\u0648\u0639 \u0627\u0644\u062A\u0642\u0648\u064A\u0645 {0}
+date.placeholder=\u0639\u0644\u0649 \u0633\u0628\u064A\u0644 \u0627\u0644\u0645\u062B\u0627\u0644 {0}
 
 
 FileSize.Byte={0} \u0628\u0627\u064A\u062A
@@ -175,7 +176,7 @@ Icon.message-success=\u062A\u0645 \u0628\u0646\u062C\u0627\u062D
 Icon.message-warning=\u062A\u062D\u0630\u064A\u0631
 Icon.move=\u0646\u0642\u0644
 Icon.multi-select=\u062A\u062D\u062F\u064A\u062F \u0645\u062A\u0639\u062F\u062F
-Icon.nav-back=\u0627\u0644\u062A\u0646\u0642\u0644 \u0644\u0644\u062E\u0644\u0641
+Icon.nav-back=\u0627\u0644\u062E\u0644\u0641
 Icon.overflow=\u0627\u0644\u0645\u0632\u064A\u062F
 Icon.redo=\u0625\u0639\u0627\u062F\u0629
 Icon.refresh=\u062A\u062D\u062F\u064A\u062B

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

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=\u0417\u0430\u0435\u0442
 
 date.week.calendarweek.wide=\u041A\u0430\u043B\u0435\u043D\u0434\u0430\u0440\u043D\u0430 \u0441\u0435\u0434\u043C\u0438\u0446\u0430 {0}
 date.week.calendarweek.narrow=\u041A\u0421 {0}
+date.placeholder=\u041D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 {0}
 
 
 FileSize.Byte={0} \u0431\u0430\u0439\u0442

package/src/sap/ui/core/messagebundle_ca.properties

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=Ocupat
 
 date.week.calendarweek.wide=Setmana natural {0}
 date.week.calendarweek.narrow=Setmana natural {0}
+date.placeholder=Per exemple, {0}
 
 
 FileSize.Byte={0} byte

package/src/sap/ui/core/messagebundle_cs.properties

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=Zam\u011Bstnan\u00FD
 
 date.week.calendarweek.wide=Kalend\u00E1\u0159n\u00ED t\u00FDdny{0}
 date.week.calendarweek.narrow=KT {0}
+date.placeholder=Nap\u0159\u00EDklad {0}
 
 
 FileSize.Byte={0} Byte
@@ -175,7 +176,7 @@ Icon.message-success=\u00DAsp\u011B\u0161n\u00E9
 Icon.message-warning=Upozorn\u011Bn\u00ED
 Icon.move=P\u0159em\u00EDst\u011Bn\u00ED
 Icon.multi-select=V\u00EDcen\u00E1sobn\u00FD v\u00FDb\u011Br
-Icon.nav-back=Navigovat zp\u011Bt
+Icon.nav-back=Zp\u011Bt
 Icon.overflow=V\u00EDce
 Icon.redo=Opakov\u00E1n\u00ED
 Icon.refresh=Aktualizovat

package/src/sap/ui/core/messagebundle_cy.properties

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=Prysur
 
 date.week.calendarweek.wide=Wythnos Galendr {0}
 date.week.calendarweek.narrow=WG {0}
+date.placeholder=Er enghraifft {0}
 
 
 FileSize.Byte={0} Beit
@@ -175,7 +176,7 @@ Icon.message-success=Llwyddiannus
 Icon.message-warning=Rhybudd
 Icon.move=Symud
 Icon.multi-select=Dewis Mwy nag Un
-Icon.nav-back=Llywio'n \u00F4l
+Icon.nav-back=Yn \u00F4l
 Icon.overflow=Mwy
 Icon.redo=Ail-wneud
 Icon.refresh=Adnewyddu

package/src/sap/ui/core/messagebundle_da.properties

@@ -22,6 +22,7 @@ BUSY_VALUE_TEXT=Optaget
 
 date.week.calendarweek.wide=Kalenderuge {0}
 date.week.calendarweek.narrow=KU {0}
+date.placeholder=For eksempel {0}
 
 
 FileSize.Byte={0} byte
@@ -175,7 +176,7 @@ Icon.message-success=Uden fejl
 Icon.message-warning=Advarsel
 Icon.move=Flyt
 Icon.multi-select=Multiselektion
-Icon.nav-back=Naviger tilbage
+Icon.nav-back=Tilbage
 Icon.overflow=Mere
 Icon.redo=Gentag
 Icon.refresh=Opdater