@openui5/sap.ui.core 1.102.12 → 1.102.14

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -880,10 +880,105 @@ sap.ui.define([
 	};
 
 	/**
-	 * Pattern elements
+	 * Creates a pattern symbol object containing all needed functions to be used for formatting and parsing.
+	 * Functions which are not given in <code>mParameters</code> are provided with a default implementation.
+	 *
+	 * @param {Object<string,any>} mParameters
+	 *   A parameters map for creating a pattern symbol
+	 * @param {string} mParameters.name
+	 *   An internal unique name describing this symbol
+	 * @param {function(Object<string, any>, sap.ui.core.date.UniversalDate, boolean, sap.ui.core.format.DateFormat,
+	 *     string): string} [mParameters.format]
+	 *   A function to format the symbol part based on a given date object
+	 * @param {function(string, Object<string, any>, sap.ui.core.format.DateFormat, object, string): object}
+	 *     [mParameters.parse]
+	 *   A function to parse the symbol part based on a given date string
+	 * @param {boolean|function(int): boolean} [mParameters.isNumeric]
+	 *   A boolean to describe, or a function to evaluate, whether the pattern symbol expects a
+	 *   numeric representation. For example pattern "MM" results in "02" and is therefore numeric,
+	 *   but "MMM" results in "Feb" which is not numeric.
+	 * @returns {{name: string, format: function, parse: function, isNumeric: function}}
+	 *   A pattern symbol object
+	 *
+	 * @private
+	 */
+	DateFormat._createPatternSymbol = function (mParameters) {
+		var fnIsNumeric = typeof mParameters.isNumeric === "function" && mParameters.isNumeric
+				// Default: false
+				|| function () { return mParameters.isNumeric || false; };
+
+		return {
+			name: mParameters.name,
+
+			/**
+			 * Formatter for a pattern symbol.
+			 *
+			 * @param {Object<string, any>} oField
+			 *   The date pattern field as parsed by {@link DateFormat#parseCldrDatePattern}
+			 * @param {sap.ui.core.date.UniversalDate} oDate
+			 *   The date object to format
+			 * @param {boolean} bUTC
+			 *   Whether the UTC option is set
+			 * @param {sap.ui.core.format.DateFormat} oFormat
+			 *   The <code>DateFormat</code> instance
+			 * @returns {string}
+			 *   The formatted date information for this date pattern part
+			 */
+			format: mParameters.format
+				// not supported, but reserved
+				|| function () { return ""; },
+
+			/**
+			 * Parser for a pattern symbol.
+			 *
+			 * @param {string} sValue
+			 *   The given input
+			 * @param {Object<string, any>} oPart
+			 *   The date pattern field as parsed by {@link DateFormat#parseCldrDatePattern}
+			 * @param {sap.ui.core.format.DateFormat} oFormat
+			 *   The <code>DateFormat</code> instance
+			 * @param {object} oConfig
+			 *   The configuration object for parsing the value
+			 * @param {object} oConfig.dateValue
+			 *   The already parsed date fields
+			 * @param {boolean} oConfig.exactLength
+			 *   Whether parsing with the exact length specified by {@link DateFormat#parseCldrDatePattern} is needed
+			 * @param {object[]} oConfig.formatArray
+			 *   The complete format array as parsed by {@link DateFormat#parseCldrDatePattern}
+			 * @param {int} oConfig.index
+			 *   The current index in the format array
+			 * @param {boolean} oConfig.strict
+			 *   Whether to disallow overflows for component values of a date (see
+			 *   https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date).
+			 *   Note that the corresponding checks are just for number ranges which are possible <em>at max</em>
+			 *   without overflow; the check for day does not consider the month and year to compute the maximum
+			 *   number of days allowed.
+			 * @param {string} sTimezone
+			 *   The IANA timezone ID
+			 * @returns {object}
+			 *   The parsed date information for this date pattern part; could contain the property <code>valid</code>
+			 *   set to <code>false</code> if parsing was not successful
+			 */
+			parse: mParameters.parse
+				// not supported, but reserved
+				|| function () { return {}; },
+
+			/**
+			 * Evaluates whether this symbol has a numeric representation.
+			 *
+			 * @param {int} [iDigits] The number of repetitions of the pattern symbol, e.g. <code>3</code> for "aaa"
+			 * @returns {boolean} Whether this symbol has a numeric representation
+			 */
+			isNumeric: fnIsNumeric
+		};
+	};
+
+	/**
+	 * Provides functionality to format and parse a given pattern symbol.
+	 * @see https://unicode.org/reports/tr35/tr35-dates.html#table-date-field-symbol-table
 	 */
 	DateFormat.prototype.oSymbols = {
-		"": {
+		"": DateFormat._createPatternSymbol({
 			name: "text",
 			format: function(oField, oDate) {
 				return oField.value;
@@ -942,8 +1037,8 @@ sap.ui.define([
 					};
 				}
 			}
-		},
-		"G": {
+		}),
+		"G": DateFormat._createPatternSymbol({
 			name: "era",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iEra = oDate.getUTCEra();
@@ -973,8 +1068,8 @@ sap.ui.define([
 					valid: oParseHelper.checkValid(oPart.type, true, oFormat)
 				};
 			}
-		},
-		"y": {
+		}),
+		"y": DateFormat._createPatternSymbol({
 			name: "year",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iYear = oDate.getUTCFullYear();
@@ -992,15 +1087,19 @@ sap.ui.define([
 				return sYear.padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var sCalendarType = oFormat.oFormatOptions.calendarType;
-				var sPart;
+				var iExpectedDigits, sPart, bPartInvalid,
+					sCalendarType = oFormat.oFormatOptions.calendarType;
+
 				if (oPart.digits == 1) {
-					sPart = oParseHelper.findNumbers(sValue, 4);
+					iExpectedDigits = 4;
 				} else if (oPart.digits == 2) {
-					sPart = oParseHelper.findNumbers(sValue, 2);
+					iExpectedDigits = 2;
 				} else {
-					sPart = oParseHelper.findNumbers(sValue, oPart.digits);
+					iExpectedDigits = oPart.digits;
 				}
+				sPart = oParseHelper.findNumbers(sValue, iExpectedDigits);
+				bPartInvalid = sPart === ""
+					|| oConfig.exactLength && sPart.length !== iExpectedDigits;
 
 				var iYear = parseInt(sPart);
 				// Find the right century for two-digit years
@@ -1036,12 +1135,13 @@ sap.ui.define([
 				}
 				return {
 					length: sPart.length,
-					valid: oParseHelper.checkValid(oPart.type, sPart === "", oFormat),
+					valid: oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat),
 					year: iYear
 				};
-			}
-		},
-		"Y": {
+			},
+			isNumeric: true
+		}),
+		"Y": DateFormat._createPatternSymbol({
 			name: "weekYear",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var oWeek = oDate.getUTCWeek(oFormat.oLocale, oFormat.oFormatOptions.calendarWeekNumbering);
@@ -1060,15 +1160,20 @@ sap.ui.define([
 				return sWeekYear.padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var sCalendarType = oFormat.oFormatOptions.calendarType;
-				var sPart;
+				var iExpectedDigits, sPart, bPartInvalid,
+					sCalendarType = oFormat.oFormatOptions.calendarType;
+
 				if (oPart.digits == 1) {
-					sPart = oParseHelper.findNumbers(sValue, 4);
+					iExpectedDigits = 4;
 				} else if (oPart.digits == 2) {
-					sPart = oParseHelper.findNumbers(sValue, 2);
+					iExpectedDigits = 2;
 				} else {
-					sPart = oParseHelper.findNumbers(sValue, oPart.digits);
+					iExpectedDigits = oPart.digits;
 				}
+				sPart = oParseHelper.findNumbers(sValue, iExpectedDigits);
+				bPartInvalid = sPart === ""
+					|| oConfig.exactLength && sPart.length !== iExpectedDigits;
+
 				var iYear = parseInt(sPart);
 				var iWeekYear = iYear;
 				// Find the right century for two-digit years
@@ -1087,13 +1192,14 @@ sap.ui.define([
 				}
 				return {
 					length: sPart.length,
-					valid: oParseHelper.checkValid(oPart.type, sPart === "", oFormat),
+					valid: oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat),
 					year: iYear,
 					weekYear: iWeekYear
 				};
-			}
-		},
-		"M": {
+			},
+			isNumeric: true
+		}),
+		"M": DateFormat._createPatternSymbol({
 			name: "month",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iMonth = oDate.getUTCMonth();
@@ -1108,14 +1214,18 @@ sap.ui.define([
 				}
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var aMonthsVariants = [oFormat.aMonthsWide, oFormat.aMonthsWideSt, oFormat.aMonthsAbbrev, oFormat.aMonthsAbbrevSt, oFormat.aMonthsNarrow, oFormat.aMonthsNarrowSt];
-				var bValid;
-				var iMonth;
-				var sPart;
+				var iMonth, sPart, bPartInvalid, bValid,
+					aMonthsVariants = [
+						oFormat.aMonthsWide, oFormat.aMonthsWideSt,
+						oFormat.aMonthsAbbrev, oFormat.aMonthsAbbrevSt,
+						oFormat.aMonthsNarrow, oFormat.aMonthsNarrowSt
+					];
 
 				if (oPart.digits < 3) {
 					sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-					bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2;
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 					iMonth = parseInt(sPart) - 1;
 					if (oConfig.strict && (iMonth > 11 || iMonth < 0)) {
 						bValid = false;
@@ -1138,9 +1248,12 @@ sap.ui.define([
 					length: sPart ? sPart.length : 0,
 					valid: bValid
 				};
+			},
+			isNumeric: function (iDigits) {
+				return iDigits < 3;
 			}
-		},
-		"L": {
+		}),
+		"L": DateFormat._createPatternSymbol({
 			name: "monthStandalone",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iMonth = oDate.getUTCMonth();
@@ -1155,14 +1268,18 @@ sap.ui.define([
 				}
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var aMonthsVariants = [oFormat.aMonthsWide, oFormat.aMonthsWideSt, oFormat.aMonthsAbbrev, oFormat.aMonthsAbbrevSt, oFormat.aMonthsNarrow, oFormat.aMonthsNarrowSt];
-				var bValid;
-				var iMonth;
-				var sPart;
+				var iMonth, sPart, bPartInvalid, bValid,
+					aMonthsVariants = [
+						oFormat.aMonthsWide, oFormat.aMonthsWideSt,
+						oFormat.aMonthsAbbrev, oFormat.aMonthsAbbrevSt,
+						oFormat.aMonthsNarrow, oFormat.aMonthsNarrowSt
+					];
 
 				if (oPart.digits < 3) {
 					sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-					bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2;
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 					iMonth = parseInt(sPart) - 1;
 					if (oConfig.strict && (iMonth > 11 || iMonth < 0)) {
 						bValid = false;
@@ -1185,9 +1302,12 @@ sap.ui.define([
 					length: sPart ? sPart.length : 0,
 					valid: bValid
 				};
+			},
+			isNumeric: function (iDigits) {
+				return iDigits < 3;
 			}
-		},
-		"w": {
+		}),
+		"w": DateFormat._createPatternSymbol({
 			name: "weekInYear",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var oWeek = oDate.getUTCWeek(oFormat.oLocale, oFormat.oFormatOptions.calendarWeekNumbering);
@@ -1201,16 +1321,16 @@ sap.ui.define([
 				return sWeek;
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart;
-				var iWeek;
-				var iLength = 0;
+				var sPart, bPartInvalid, bValid, iWeek,
+					iLength = 0;
 
 				if (oPart.digits < 3) {
 					sPart = oParseHelper.findNumbers(sValue, 2);
 					iLength = sPart.length;
 					iWeek = parseInt(sPart) - 1;
-					bValid = oParseHelper.checkValid(oPart.type, !sPart, oFormat);
+					bPartInvalid = !sPart
+						|| oConfig.exactLength && iLength < 2;
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 				} else {
 					sPart = oFormat.oLocaleData.getCalendarWeek(oPart.digits === 3 ? "narrow" : "wide");
 					sPart = sPart.replace("{0}", "([0-9]+)");
@@ -1231,37 +1351,30 @@ sap.ui.define([
 					valid: bValid,
 					week: iWeek
 				};
-			}
-		},
-		"W": {
-			name: "weekInMonth",
-			format: function(oField, oDate) {
-				// not supported
-				return "";
 			},
-			parse: function() {
-				return {};
-			}
-		},
-		"D": {
-			name: "dayInYear",
-			format: function(oField, oDate) {
-
-			},
-			parse: function() {
-				return {};
-			}
-		},
-		"d": {
+			isNumeric: function (iDigits) {
+				return iDigits < 3;
+			}
+		}),
+		"W": DateFormat._createPatternSymbol({
+			name: "weekInMonth"
+		}),
+		"D": DateFormat._createPatternSymbol({
+			name: "dayInYear"
+		}),
+		"d": DateFormat._createPatternSymbol({
 			name: "day",
 			format: function(oField, oDate) {
 				var iDate = oDate.getUTCDate();
 				return String(iDate).padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
-				var iDay = parseInt(sPart);
+				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat),
+					iDay = parseInt(sPart);
+
 				if (oConfig.strict && (iDay > 31 || iDay < 1)) {
 					bValid = false;
 				}
@@ -1270,9 +1383,10 @@ sap.ui.define([
 					length: sPart.length,
 					valid: bValid
 				};
-			}
-		},
-		"Q": {
+			},
+			isNumeric: true
+		}),
+		"Q": DateFormat._createPatternSymbol({
 			name: "quarter",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iQuarter = oDate.getUTCQuarter();
@@ -1287,14 +1401,14 @@ sap.ui.define([
 				}
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var iQuarter;
-				var sPart;
+				var sPart, bPartInvalid, iQuarter, bValid;
 				var aQuartersVariants = [oFormat.aQuartersWide, oFormat.aQuartersWideSt, oFormat.aQuartersAbbrev, oFormat.aQuartersAbbrevSt, oFormat.aQuartersNarrow, oFormat.aQuartersNarrowSt];
 
 				if (oPart.digits < 3) {
 					sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-					bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2;
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 					iQuarter = parseInt(sPart) - 1;
 					if (oConfig.strict && iQuarter > 3) {
 						bValid = false;
@@ -1318,9 +1432,12 @@ sap.ui.define([
 					quarter: iQuarter,
 					valid: bValid
 				};
+			},
+			isNumeric: function (iDigits) {
+				return iDigits < 3;
 			}
-		},
-		"q": {
+		}),
+		"q": DateFormat._createPatternSymbol({
 			name: "quarterStandalone",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iQuarter = oDate.getUTCQuarter();
@@ -1335,14 +1452,14 @@ sap.ui.define([
 				}
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var iQuarter;
-				var sPart;
+				var sPart, bPartInvalid, iQuarter, bValid;
 				var aQuartersVariants = [oFormat.aQuartersWide, oFormat.aQuartersWideSt, oFormat.aQuartersAbbrev, oFormat.aQuartersAbbrevSt, oFormat.aQuartersNarrow, oFormat.aQuartersNarrowSt];
 
 				if (oPart.digits < 3) {
 					sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-					bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2;
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 					iQuarter = parseInt(sPart) - 1;
 					if (oConfig.strict && iQuarter > 3) {
 						bValid = false;
@@ -1366,19 +1483,15 @@ sap.ui.define([
 					quarter: iQuarter,
 					valid: bValid
 				};
-			}
-		},
-		"F": {
-			name: "dayOfWeekInMonth",
-			format: function(oField, oDate, oFormat) {
-				// not supported
-				return "";
 			},
-			parse: function() {
-				return {};
-			}
-		},
-		"E": {
+			isNumeric: function (iDigits) {
+				return iDigits < 3;
+			}
+		}),
+		"F": DateFormat._createPatternSymbol({
+			name: "dayOfWeekInMonth"
+		}),
+		"E": DateFormat._createPatternSymbol({
 			name: "dayNameInWeek", //Day of week name, format style.
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iDay = oDate.getUTCDay();
@@ -1407,8 +1520,8 @@ sap.ui.define([
 					}
 				}
 			}
-		},
-		"c": {
+		}),
+		"c": DateFormat._createPatternSymbol({
 			name: "dayNameInWeekStandalone",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iDay = oDate.getUTCDay();
@@ -1436,23 +1549,26 @@ sap.ui.define([
 					}
 				}
 			}
-		},
-		"u": {
+		}),
+		"u": DateFormat._createPatternSymbol({
 			name: "dayNumberOfWeek",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iDay = oDate.getUTCDay();
 				return oFormat._adaptDayOfWeek(iDay);
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var sPart = oParseHelper.findNumbers(sValue, oPart.digits);
+				var sPart = oParseHelper.findNumbers(sValue, oPart.digits),
+					bPartInvalid = oConfig.exactLength && sPart.length !== oPart.digits;
 
 				return {
 					dayNumberOfWeek: parseInt(sPart),
-					length: sPart.length
+					length: sPart.length,
+					valid: oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat)
 				};
-			}
-		},
-		"a": {
+			},
+			isNumeric: true
+		}),
+		"a": DateFormat._createPatternSymbol({
 			name: "amPmMarker",
 			format: function(oField, oDate, bUTC, oFormat) {
 				var iDayPeriod = oDate.getUTCDayPeriod();
@@ -1498,19 +1614,19 @@ sap.ui.define([
 					length: iLength
 				};
 			}
-		},
-		"H": {
+		}),
+		"H": DateFormat._createPatternSymbol({
 			name: "hour0_23",
 			format: function(oField, oDate) {
 				var iHours = oDate.getUTCHours();
 				return String(iHours).padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iHours = parseInt(sPart);
-
-				bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					iHours = parseInt(sPart),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
 				if (oConfig.strict && iHours > 23) {
 					bValid = false;
@@ -1521,9 +1637,10 @@ sap.ui.define([
 					length: sPart.length,
 					valid: bValid
 				};
-			}
-		},
-		"k": {
+			},
+			isNumeric: true
+		}),
+		"k": DateFormat._createPatternSymbol({
 			name: "hour1_24",
 			format: function(oField, oDate) {
 				var iHours = oDate.getUTCHours();
@@ -1532,11 +1649,11 @@ sap.ui.define([
 				return sHours.padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iHours = parseInt(sPart);
-
-				bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					iHours = parseInt(sPart),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
 				if (iHours == 24) {
 					iHours = 0;
@@ -1550,9 +1667,10 @@ sap.ui.define([
 					length: sPart.length,
 					valid: bValid
 				};
-			}
-		},
-		"K": {
+			},
+			isNumeric: true
+		}),
+		"K": DateFormat._createPatternSymbol({
 			name: "hour0_11",
 			format: function(oField, oDate) {
 				var iHours = oDate.getUTCHours();
@@ -1561,11 +1679,11 @@ sap.ui.define([
 				return sHours.padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iHours = parseInt(sPart);
-
-				bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					iHours = parseInt(sPart),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
 				if (oConfig.strict && iHours > 11) {
 					bValid = false;
@@ -1576,9 +1694,10 @@ sap.ui.define([
 					length: sPart.length,
 					valid: bValid
 				};
-			}
-		},
-		"h": {
+			},
+			isNumeric: true
+		}),
+		"h": DateFormat._createPatternSymbol({
 			name: "hour1_12",
 			format: function(oField, oDate) {
 				var iHours = oDate.getUTCHours();
@@ -1594,11 +1713,13 @@ sap.ui.define([
 				return sHours.padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bPM = oConfig.dateValue.pm;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iHours = parseInt(sPart);
+				var bPM = oConfig.dateValue.pm,
+					sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					iHours = parseInt(sPart),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
-				var bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
 
 				if (iHours == 12) {
 					iHours = 0;
@@ -1617,20 +1738,21 @@ sap.ui.define([
 					pm: bPM,
 					valid: bValid
 				};
-			}
-		},
-		"m": {
+			},
+			isNumeric: true
+		}),
+		"m": DateFormat._createPatternSymbol({
 			name: "minute",
 			format: function(oField, oDate) {
 				var iMinutes = oDate.getUTCMinutes();
 				return String(iMinutes).padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iMinutes = parseInt(sPart);
-
-				bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2)),
+					iMinutes = parseInt(sPart),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < 2,
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
 				if (oConfig.strict && iMinutes > 59) {
 					bValid = false;
@@ -1641,20 +1763,22 @@ sap.ui.define([
 					minute: iMinutes,
 					valid: bValid
 				};
-			}
-		},
-		"s": {
+			},
+			isNumeric: true
+		}),
+		"s": DateFormat._createPatternSymbol({
 			name: "second",
 			format: function(oField, oDate) {
 				var iSeconds = oDate.getUTCSeconds();
 				return String(iSeconds).padStart(oField.digits, "0");
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var bValid;
-				var sPart = oParseHelper.findNumbers(sValue, Math.max(oPart.digits, 2));
-				var iSeconds = parseInt(sPart);
-
-				bValid = oParseHelper.checkValid(oPart.type, sPart === "", oFormat);
+				var iExpectedDigits = Math.max(oPart.digits, 2),
+					sPart = oParseHelper.findNumbers(sValue, iExpectedDigits),
+					bPartInvalid = sPart === ""
+						|| oConfig.exactLength && sPart.length < iExpectedDigits,
+					iSeconds = parseInt(sPart),
+					bValid = oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat);
 
 				if (oConfig.strict && iSeconds > 59) {
 					bValid = false;
@@ -1665,9 +1789,10 @@ sap.ui.define([
 					second: iSeconds,
 					valid: bValid
 				};
-			}
-		},
-		"S": {
+			},
+			isNumeric: true
+		}),
+		"S": DateFormat._createPatternSymbol({
 			name: "fractionalsecond",
 			format: function(oField, oDate) {
 				var iMilliseconds = oDate.getUTCMilliseconds();
@@ -1678,8 +1803,9 @@ sap.ui.define([
 				return sFractionalseconds;
 			},
 			parse: function(sValue, oPart, oFormat, oConfig) {
-				var sPart = oParseHelper.findNumbers(sValue, oPart.digits);
-				var iLength = sPart.length;
+				var sPart = oParseHelper.findNumbers(sValue, oPart.digits),
+					iLength = sPart.length,
+					bPartInvalid = oConfig.exactLength && iLength < oPart.digits;
 
 				sPart = sPart.substr(0, 3);
 				sPart = sPart.padEnd(3, "0");
@@ -1688,11 +1814,13 @@ sap.ui.define([
 
 				return {
 					length: iLength,
-					millisecond: iMilliseconds
+					millisecond: iMilliseconds,
+					valid: oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat)
 				};
-			}
-		},
-		"z": {
+			},
+			isNumeric: true
+		}),
+		"z": DateFormat._createPatternSymbol({
 			name: "timezoneGeneral",
 			format: function(oField, oDate, bUTC, oFormat, sTimezone) {
 				//TODO getTimezoneLong and getTimezoneShort does not exist on Date object
@@ -1752,8 +1880,8 @@ sap.ui.define([
 					tzDiff: iTZDiff
 				};
 			}
-		},
-		"Z": {
+		}),
+		"Z": DateFormat._createPatternSymbol({
 			name: "timezoneRFC822",
 			format: function(oField, oDate, bUTC, oFormat, sTimezone) {
 				var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
@@ -1780,8 +1908,8 @@ sap.ui.define([
 			parse: function(sValue, oPart, oFormat, oConfig) {
 				return oParseHelper.parseTZ(sValue, false);
 			}
-		},
-		"X": {
+		}),
+		"X": DateFormat._createPatternSymbol({
 			name: "timezoneISO8601",
 			format: function(oField, oDate, bUTC, oFormat, sTimezone) {
 				/*
@@ -1845,8 +1973,8 @@ sap.ui.define([
 					return oParseHelper.parseTZ(sValue, oPart.digits === 3 || oPart.digits === 5);
 				}
 			}
-		},
-		"V": {
+		}),
+		"V": DateFormat._createPatternSymbol({
 			name: "timezoneID",
 			format: function(oField, oDate, bUTC, oFormat, sTimezone) {
 				// Only VV is supported
@@ -1903,7 +2031,7 @@ sap.ui.define([
 
 				return oTimezoneParsed;
 			}
-		}
+		})
 	};
 
 	DateFormat.prototype._format = function(oJSDate, bUTC, sTimezone) {
@@ -2128,26 +2256,31 @@ sap.ui.define([
 	};
 
 	DateFormat.prototype._parse = function(sValue, aFormatArray, bUTC, bStrict, sTimezone) {
-		var iIndex = 0,
-			oPart, sSubValue, oResult;
-
-		var oDateValue = {
-			valid: true,
-			lastTimezonePatternSymbol: ""
-		};
+		var oNextPart, oPart, oPrevPart, oResult, sSubValue,
+			oDateValue = {
+				valid: true,
+				lastTimezonePatternSymbol: ""
+			},
+			iIndex = 0,
+			oParseConf = {
+				formatArray: aFormatArray,
+				dateValue: oDateValue,
+				strict: bStrict
+			},
+			that = this;
 
-		var oParseConf = {
-			formatArray: aFormatArray,
-			dateValue: oDateValue,
-			strict: bStrict
-		};
+		function getSymbol(oPart0) { return that.oSymbols[oPart0.symbol || ""]; }
+		function isNumeric(oPart0) { return !!oPart0 && getSymbol(oPart0).isNumeric(oPart0.digits); }
 
 		for (var i = 0; i < aFormatArray.length; i++) {
 			sSubValue = sValue.substr(iIndex);
 			oPart = aFormatArray[i];
+			oPrevPart = aFormatArray[i - 1];
+			oNextPart = aFormatArray[i + 1];
 			oParseConf.index = i;
+			oParseConf.exactLength = isNumeric(oPart) && (isNumeric(oPrevPart) || isNumeric(oNextPart));
 
-			oResult = this.oSymbols[oPart.symbol || ""].parse(sSubValue, oPart, this, oParseConf, sTimezone) || {};
+			oResult = getSymbol(oPart).parse(sSubValue, oPart, this, oParseConf, sTimezone) || {};
 			// Remember the last required timezone difference which needs to be calculated (V pattern) or applied (x and z pattern)
 			if (oResult.tzDiff !== undefined || oResult.timezone) {
 				oResult.lastTimezonePatternSymbol = oPart.symbol;