@ui5/webcomponents-localization 0.0.0-cf50976ce → 0.0.0-d1315d658

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

@@ -1,13 +1,17 @@
-import Core from '../Core.js';
+import Log from '../../../base/Log.js';
+import formatMessage from '../../../base/strings/formatMessage.js';
+import deepEqual from '../../../base/util/deepEqual.js';
+import extend from '../../../base/util/extend.js';
 import CalendarType from '../CalendarType.js';
+import Configuration from '../Configuration.js';
+import Core from '../Core.js';
 import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
+import CalendarUtils from '../date/CalendarUtils.js';
+import CalendarWeekNumbering from '../date/CalendarWeekNumbering.js';
+import UI5Date from '../date/UI5Date.js';
 import UniversalDate from '../date/UniversalDate.js';
 import TimezoneUtil from './TimezoneUtil.js';
-import deepEqual from '../../../base/util/deepEqual.js';
-import formatMessage from '../../../base/strings/formatMessage.js';
-import Log from '../../../base/Log.js';
-import extend from '../../../base/util/extend.js';
 var DateFormat = function () {
     throw new Error();
 };
@@ -229,21 +233,23 @@ DateFormat.getDateTimeInstance = function (oFormatOptions, oLocale) {
 };
 DateFormat.getDateTimeWithTimezoneInstance = function (oFormatOptions, oLocale) {
     if (oFormatOptions && !(oFormatOptions instanceof Locale)) {
-        oFormatOptions = Object.assign({}, oFormatOptions);
-        if (typeof oFormatOptions.showTimezone === 'string') {
-            var sShowTimezone = oFormatOptions.showTimezone;
-            if (oFormatOptions.showDate === undefined && oFormatOptions.showTime === undefined) {
-                if (sShowTimezone === 'Hide') {
-                    oFormatOptions.showTimezone = false;
-                } else if (sShowTimezone === 'Only') {
-                    oFormatOptions.showDate = false;
-                    oFormatOptions.showTime = false;
+        (function () {
+            oFormatOptions = Object.assign({}, oFormatOptions);
+            if (typeof oFormatOptions.showTimezone === 'string') {
+                var sShowTimezone = oFormatOptions.showTimezone;
+                if (oFormatOptions.showDate === undefined && oFormatOptions.showTime === undefined) {
+                    if (sShowTimezone === 'Hide') {
+                        oFormatOptions.showTimezone = false;
+                    } else if (sShowTimezone === 'Only') {
+                        oFormatOptions.showDate = false;
+                        oFormatOptions.showTime = false;
+                    }
                 }
+                oFormatOptions.showTimezone = sShowTimezone !== 'Hide';
             }
-            oFormatOptions.showTimezone = sShowTimezone !== 'Hide';
-        }
+        }());
         if (oFormatOptions.showDate === false && oFormatOptions.showTime === false && oFormatOptions.showTimezone === false) {
-            throw new TypeError('Invalid Configuration. One of the following format options must be true: showDate, showTime or showTimezone.');
+            throw new TypeError('Invalid Configuration. One of the following format options must be true: ' + 'showDate, showTime or showTimezone.');
         }
     }
     return this.createInstance(oFormatOptions, oLocale, DateFormat._getDateTimeWithTimezoneInfo(oFormatOptions || {}));
@@ -256,14 +262,15 @@ function createIntervalPatternWithNormalConnector(oFormat) {
     sPattern = sPattern.replace(/[^\{\}01 ]/, '-');
     return sPattern.replace(/\{(0|1)\}/g, oFormat.oFormatOptions.pattern);
 }
-DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
-    var oFormat = Object.create(this.prototype);
+DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo, bIsFallback) {
+    var aFallbackFormatOptions, oFormat, sPattern;
+    oFormat = Object.create(this.prototype);
     if (oFormatOptions instanceof Locale) {
         oLocale = oFormatOptions;
         oFormatOptions = undefined;
     }
     if (!oLocale) {
-        oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale();
+        oLocale = Configuration.getFormatSettings().getFormatLocale();
     }
     oFormat.oLocale = oLocale;
     oFormat.oLocaleData = LocaleData.getInstance(oLocale);
@@ -279,7 +286,13 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
     }
     oFormat.type = oInfo.type;
     if (!oFormat.oFormatOptions.calendarType) {
-        oFormat.oFormatOptions.calendarType = Core.getConfiguration().getCalendarType();
+        oFormat.oFormatOptions.calendarType = Configuration.getCalendarType();
+    }
+    if (oFormat.oFormatOptions.firstDayOfWeek === undefined && oFormat.oFormatOptions.minimalDaysInFirstWeek !== undefined || oFormat.oFormatOptions.firstDayOfWeek !== undefined && oFormat.oFormatOptions.minimalDaysInFirstWeek === undefined) {
+        throw new TypeError('Format options firstDayOfWeek and minimalDaysInFirstWeek need both to be set, but only one was provided.');
+    }
+    if (oFormat.oFormatOptions.calendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(oFormat.oFormatOptions.calendarWeekNumbering)) {
+        throw new TypeError('Illegal format option calendarWeekNumbering: \'' + oFormat.oFormatOptions.calendarWeekNumbering + '\'');
     }
     if (!oFormat.oFormatOptions.pattern) {
         if (oFormat.oFormatOptions.format) {
@@ -289,13 +302,16 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
         }
     }
     if (oFormat.oFormatOptions.interval) {
+        var sSinglePattern, sDelimiter = oFormat.oFormatOptions.intervalDelimiter;
         if (oFormat.oFormatOptions.format) {
             oFormat.intervalPatterns = oFormat.oLocaleData.getCustomIntervalPattern(oFormat.oFormatOptions.format, null, oFormat.oFormatOptions.calendarType);
             if (typeof oFormat.intervalPatterns === 'string') {
                 oFormat.intervalPatterns = [oFormat.intervalPatterns];
             }
-            oFormat.intervalPatterns.push(oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType));
+            sSinglePattern = oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType);
+            oFormat.intervalPatterns.push(sSinglePattern);
         } else {
+            sSinglePattern = oFormat.oFormatOptions.pattern;
             oFormat.intervalPatterns = [
                 oFormat.oLocaleData.getCombinedIntervalPattern(oFormat.oFormatOptions.pattern, oFormat.oFormatOptions.calendarType),
                 oFormat.oFormatOptions.pattern
@@ -303,31 +319,34 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
         }
         var sCommonConnectorPattern = createIntervalPatternWithNormalConnector(oFormat);
         oFormat.intervalPatterns.push(sCommonConnectorPattern);
+        if (sDelimiter) {
+            sDelimiter = sDelimiter.replace(/'/g, '\'\'');
+            sDelimiter = '\'' + sDelimiter + '\'';
+            oFormat.intervalPatterns.unshift(sSinglePattern + sDelimiter + sSinglePattern);
+        }
+        oFormat.intervalPatterns = Array.from(new Set(oFormat.intervalPatterns));
     }
-    if (!oFormat.oFormatOptions.fallback) {
-        if (!oInfo.oFallbackFormats) {
-            oInfo.oFallbackFormats = {};
+    if (!bIsFallback) {
+        aFallbackFormatOptions = oInfo.aFallbackFormatOptions;
+        if (oInfo.bShortFallbackFormatOptions) {
+            sPattern = oInfo.getPattern(oFormat.oLocaleData, 'short');
+            aFallbackFormatOptions = aFallbackFormatOptions.concat(DateFormat._createFallbackOptionsWithoutDelimiter(sPattern));
         }
-        var sLocale = oLocale.toString(), sCalendarType = oFormat.oFormatOptions.calendarType, sKey = sLocale + '-' + sCalendarType, sPattern, aFallbackFormatOptions;
         if (oFormat.oFormatOptions.pattern && oInfo.bPatternFallbackWithoutDelimiter) {
-            sKey = sKey + '-' + oFormat.oFormatOptions.pattern;
-        }
-        if (oFormat.oFormatOptions.interval) {
-            sKey = sKey + '-' + 'interval';
-        }
-        var oFallbackFormats = oInfo.oFallbackFormats[sKey] ? Object.assign({}, oInfo.oFallbackFormats[sKey]) : undefined;
-        if (!oFallbackFormats) {
-            aFallbackFormatOptions = oInfo.aFallbackFormatOptions;
-            if (oInfo.bShortFallbackFormatOptions) {
-                sPattern = oInfo.getPattern(oFormat.oLocaleData, 'short');
-                aFallbackFormatOptions = aFallbackFormatOptions.concat(DateFormat._createFallbackOptionsWithoutDelimiter(sPattern));
-            }
-            if (oFormat.oFormatOptions.pattern && oInfo.bPatternFallbackWithoutDelimiter) {
-                aFallbackFormatOptions = DateFormat._createFallbackOptionsWithoutDelimiter(oFormat.oFormatOptions.pattern).concat(aFallbackFormatOptions);
-            }
-            oFallbackFormats = DateFormat._createFallbackFormat(aFallbackFormatOptions, sCalendarType, oLocale, oInfo, oFormat.oFormatOptions);
-        }
-        oFormat.aFallbackFormats = oFallbackFormats;
+            aFallbackFormatOptions = DateFormat._createFallbackOptionsWithoutDelimiter(oFormat.oFormatOptions.pattern).concat(aFallbackFormatOptions);
+        }
+        aFallbackFormatOptions = aFallbackFormatOptions.reduce(function (aFallbacks, oOptions) {
+            var aKeys = Object.keys(oOptions), bDuplicate = aFallbacks.some(function (oOptions0) {
+                    return Object.keys(oOptions0).length === aKeys.length && aKeys.every(function (sKey) {
+                        return oOptions0[sKey] === oOptions[sKey];
+                    });
+                });
+            if (!bDuplicate) {
+                aFallbacks.push(oOptions);
+            }
+            return aFallbacks;
+        }, []);
+        oFormat.aFallbackFormats = DateFormat._createFallbackFormat(aFallbackFormatOptions, oFormat.oFormatOptions.calendarType, oLocale, oInfo, oFormat.oFormatOptions);
     }
     oFormat.oRequiredParts = oInfo.oRequiredParts;
     oFormat.aRelativeScales = oInfo.aRelativeScales;
@@ -361,7 +380,15 @@ DateFormat.prototype.init = function () {
     this.aErasNarrow = this.oLocaleData.getEras('narrow', sCalendarType);
     this.aErasAbbrev = this.oLocaleData.getEras('abbreviated', sCalendarType);
     this.aErasWide = this.oLocaleData.getEras('wide', sCalendarType);
-    this.aDayPeriods = this.oLocaleData.getDayPeriods('abbreviated', sCalendarType);
+    this.aDayPeriodsAbbrev = this.oLocaleData.getDayPeriods('abbreviated', sCalendarType);
+    this.aDayPeriodsNarrow = this.oLocaleData.getDayPeriods('narrow', sCalendarType);
+    this.aDayPeriodsWide = this.oLocaleData.getDayPeriods('wide', sCalendarType);
+    this.oFlexibleDayPeriodsAbbrev = this.oLocaleData.getFlexibleDayPeriods('abbreviated', sCalendarType);
+    this.oFlexibleDayPeriodsNarrow = this.oLocaleData.getFlexibleDayPeriods('narrow', sCalendarType);
+    this.oFlexibleDayPeriodsWide = this.oLocaleData.getFlexibleDayPeriods('wide', sCalendarType);
+    this.oFlexibleDayPeriodsAbbrevSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('abbreviated', sCalendarType);
+    this.oFlexibleDayPeriodsNarrowSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('narrow', sCalendarType);
+    this.oFlexibleDayPeriodsWideSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('wide', sCalendarType);
     this.aFormatArray = this.parseCldrDatePattern(this.oFormatOptions.pattern);
     this.sAllowedCharacters = this.getAllowedCharacters(this.aFormatArray);
 };
@@ -378,10 +405,7 @@ DateFormat._createFallbackFormat = function (aFallbackFormatOptions, sCalendarTy
             oFormatOptions.interval = true;
         }
         oFormatOptions.calendarType = sCalendarType;
-        oFormatOptions.fallback = true;
-        var oFallbackFormat = DateFormat.createInstance(oFormatOptions, oLocale, oInfo);
-        oFallbackFormat.bIsFallback = true;
-        return oFallbackFormat;
+        return DateFormat.createInstance(oFormatOptions, oLocale, oInfo, true);
     });
 };
 DateFormat._createFallbackOptionsWithoutDelimiter = function (sBasePattern) {
@@ -417,9 +441,6 @@ var oParseHelper = {
         while (iLength < iMaxLength && this.isNumber(sValue.charCodeAt(iLength))) {
             iLength++;
         }
-        if (typeof sValue !== 'string') {
-            sValue = sValue.toString();
-        }
         return sValue.substr(0, iLength);
     },
     startsWithIgnoreCase: function (sValue, sSubstring, sLocale) {
@@ -452,7 +473,7 @@ var oParseHelper = {
     },
     parseTZ: function (sValue, bColonSeparated) {
         var iLength = 0;
-        var iTZFactor = sValue.charAt(0) == '+' ? -1 : 1;
+        var iTZFactor = sValue.charAt(0) === '+' ? -1 : 1;
         var sPart;
         iLength++;
         sPart = this.findNumbers(sValue.substr(iLength), 2);
@@ -472,14 +493,30 @@ var oParseHelper = {
             tzDiff: (iTZDiff + 60 * iTZDiffHour) * 60 * iTZFactor
         };
     },
-    checkValid: function (sType, bPartInvalid, oFormat) {
-        if (sType in oFormat.oRequiredParts && bPartInvalid) {
+    checkValid: function (sSymbolName, bPartInvalid, oFormat) {
+        if (sSymbolName in oFormat.oRequiredParts && bPartInvalid) {
             return false;
         }
+        return true;
     }
 };
+DateFormat._createPatternSymbol = function (mParameters) {
+    var fnIsNumeric = typeof mParameters.isNumeric === 'function' && mParameters.isNumeric || function () {
+        return mParameters.isNumeric || false;
+    };
+    return {
+        name: mParameters.name,
+        format: mParameters.format || function () {
+            return '';
+        },
+        parse: mParameters.parse || function () {
+            return {};
+        },
+        isNumeric: fnIsNumeric
+    };
+};
 DateFormat.prototype.oSymbols = {
-    '': {
+    '': DateFormat._createPatternSymbol({
         name: 'text',
         format: function (oField, oDate) {
             return oField.value;
@@ -521,8 +558,8 @@ DateFormat.prototype.oSymbols = {
                 return { valid: oParseHelper.checkValid(oPart.type, bPartInvalid, oFormat) };
             }
         }
-    },
-    'G': {
+    }),
+    'G': DateFormat._createPatternSymbol({
         name: 'era',
         format: function (oField, oDate, bUTC, oFormat) {
             var iEra = oDate.getUTCEra();
@@ -555,34 +592,35 @@ DateFormat.prototype.oSymbols = {
                 valid: oParseHelper.checkValid(oPart.type, true, oFormat)
             };
         }
-    },
-    'y': {
+    }),
+    'y': DateFormat._createPatternSymbol({
         name: 'year',
         format: function (oField, oDate, bUTC, oFormat) {
             var iYear = oDate.getUTCFullYear();
             var sYear = String(iYear);
             var sCalendarType = oFormat.oFormatOptions.calendarType;
-            if (oField.digits == 2 && sYear.length > 2) {
+            if (oField.digits === 2 && sYear.length > 2) {
                 sYear = sYear.substr(sYear.length - 2);
             }
-            if (sCalendarType != CalendarType.Japanese && oField.digits == 1 && iYear < 100) {
+            if (sCalendarType !== CalendarType.Japanese && oField.digits === 1 && iYear < 100) {
                 sYear = sYear.padStart(4, '0');
             }
             return sYear.padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var sCalendarType = oFormat.oFormatOptions.calendarType;
-            var sPart;
-            if (oPart.digits == 1) {
-                sPart = oParseHelper.findNumbers(sValue, 4);
-            } else if (oPart.digits == 2) {
-                sPart = oParseHelper.findNumbers(sValue, 2);
+            var iExpectedDigits, sPart, bPartInvalid, sCalendarType = oFormat.oFormatOptions.calendarType;
+            if (oPart.digits === 1) {
+                iExpectedDigits = 4;
+            } else if (oPart.digits === 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);
-            if (sCalendarType != CalendarType.Japanese && sPart.length <= 2) {
-                var oCurrentDate = UniversalDate.getInstance(new Date(), sCalendarType), iCurrentYear = oCurrentDate.getUTCFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iYear - iCurrentYear;
+            if (sCalendarType !== CalendarType.Japanese && sPart.length <= 2) {
+                var oCurrentDate = UniversalDate.getInstance(UI5Date.getInstance(), sCalendarType), iCurrentYear = oCurrentDate.getUTCFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iYear - iCurrentYear;
                 if (iYearDiff < -70) {
                     iYear += (iCurrentCentury + 1) * 100;
                 } else if (iYearDiff < 30) {
@@ -593,40 +631,42 @@ DateFormat.prototype.oSymbols = {
             }
             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();
+            var oWeek = oDate.getUTCWeek(oFormat.oLocale, getCalendarWeekParameter(oFormat.oFormatOptions));
             var iWeekYear = oWeek.year;
             var sWeekYear = String(iWeekYear);
             var sCalendarType = oFormat.oFormatOptions.calendarType;
-            if (oField.digits == 2 && sWeekYear.length > 2) {
+            if (oField.digits === 2 && sWeekYear.length > 2) {
                 sWeekYear = sWeekYear.substr(sWeekYear.length - 2);
             }
-            if (sCalendarType != CalendarType.Japanese && oField.digits == 1 && iWeekYear < 100) {
+            if (sCalendarType !== CalendarType.Japanese && oField.digits === 1 && iWeekYear < 100) {
                 sWeekYear = sWeekYear.padStart(4, '0');
             }
             return sWeekYear.padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var sCalendarType = oFormat.oFormatOptions.calendarType;
-            var sPart;
-            if (oPart.digits == 1) {
-                sPart = oParseHelper.findNumbers(sValue, 4);
-            } else if (oPart.digits == 2) {
-                sPart = oParseHelper.findNumbers(sValue, 2);
+            var iExpectedDigits, sPart, bPartInvalid, sCalendarType = oFormat.oFormatOptions.calendarType;
+            if (oPart.digits === 1) {
+                iExpectedDigits = 4;
+            } else if (oPart.digits === 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;
-            if (sCalendarType != CalendarType.Japanese && sPart.length <= 2) {
-                var oCurrentDate = UniversalDate.getInstance(new Date(), sCalendarType), iCurrentYear = oCurrentDate.getUTCFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iWeekYear - iCurrentYear;
+            if (sCalendarType !== CalendarType.Japanese && sPart.length <= 2) {
+                var oCurrentDate = UniversalDate.getInstance(UI5Date.getInstance(), sCalendarType), iCurrentYear = oCurrentDate.getUTCFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iWeekYear - iCurrentYear;
                 if (iYearDiff < -70) {
                     iWeekYear += (iCurrentCentury + 1) * 100;
                 } else if (iYearDiff < 30) {
@@ -637,19 +677,20 @@ DateFormat.prototype.oSymbols = {
             }
             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();
-            if (oField.digits == 3) {
+            if (oField.digits === 3) {
                 return oFormat.aMonthsAbbrev[iMonth];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aMonthsWide[iMonth];
             } else if (oField.digits > 4) {
                 return oFormat.aMonthsNarrow[iMonth];
@@ -658,20 +699,18 @@ DateFormat.prototype.oSymbols = {
             }
         },
         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;
@@ -694,15 +733,18 @@ DateFormat.prototype.oSymbols = {
                 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();
-            if (oField.digits == 3) {
+            if (oField.digits === 3) {
                 return oFormat.aMonthsAbbrevSt[iMonth];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aMonthsWideSt[iMonth];
             } else if (oField.digits > 4) {
                 return oFormat.aMonthsNarrowSt[iMonth];
@@ -711,20 +753,18 @@ DateFormat.prototype.oSymbols = {
             }
         },
         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;
@@ -747,12 +787,15 @@ DateFormat.prototype.oSymbols = {
                 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();
+            var oWeek = oDate.getUTCWeek(oFormat.oLocale, getCalendarWeekParameter(oFormat.oFormatOptions));
             var iWeek = oWeek.week;
             var sWeek = String(iWeek + 1);
             if (oField.digits < 3) {
@@ -763,15 +806,13 @@ DateFormat.prototype.oSymbols = {
             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]+)');
@@ -788,35 +829,21 @@ DateFormat.prototype.oSymbols = {
                 valid: bValid,
                 week: iWeek
             };
-        }
-    },
-    'W': {
-        name: 'weekInMonth',
-        format: function (oField, oDate) {
-            return '';
         },
-        parse: function () {
-            return {};
+        isNumeric: function (iDigits) {
+            return iDigits < 3;
         }
-    },
-    'D': {
-        name: 'dayInYear',
-        format: function (oField, oDate) {
-        },
-        parse: function () {
-            return {};
-        }
-    },
-    'd': {
+    }),
+    '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;
             }
@@ -825,15 +852,16 @@ DateFormat.prototype.oSymbols = {
                 length: sPart.length,
                 valid: bValid
             };
-        }
-    },
-    'Q': {
+        },
+        isNumeric: true
+    }),
+    'Q': DateFormat._createPatternSymbol({
         name: 'quarter',
         format: function (oField, oDate, bUTC, oFormat) {
             var iQuarter = oDate.getUTCQuarter();
-            if (oField.digits == 3) {
+            if (oField.digits === 3) {
                 return oFormat.aQuartersAbbrev[iQuarter];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aQuartersWide[iQuarter];
             } else if (oField.digits > 4) {
                 return oFormat.aQuartersNarrow[iQuarter];
@@ -842,9 +870,7 @@ DateFormat.prototype.oSymbols = {
             }
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var bValid;
-            var iQuarter;
-            var sPart;
+            var sPart, bPartInvalid, iQuarter, bValid;
             var aQuartersVariants = [
                 oFormat.aQuartersWide,
                 oFormat.aQuartersWideSt,
@@ -855,7 +881,8 @@ DateFormat.prototype.oSymbols = {
             ];
             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;
@@ -878,15 +905,18 @@ DateFormat.prototype.oSymbols = {
                 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();
-            if (oField.digits == 3) {
+            if (oField.digits === 3) {
                 return oFormat.aQuartersAbbrevSt[iQuarter];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aQuartersWideSt[iQuarter];
             } else if (oField.digits > 4) {
                 return oFormat.aQuartersNarrowSt[iQuarter];
@@ -895,9 +925,7 @@ DateFormat.prototype.oSymbols = {
             }
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var bValid;
-            var iQuarter;
-            var sPart;
+            var sPart, bPartInvalid, iQuarter, bValid;
             var aQuartersVariants = [
                 oFormat.aQuartersWide,
                 oFormat.aQuartersWideSt,
@@ -908,7 +936,8 @@ DateFormat.prototype.oSymbols = {
             ];
             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;
@@ -931,26 +960,21 @@ DateFormat.prototype.oSymbols = {
                 quarter: iQuarter,
                 valid: bValid
             };
-        }
-    },
-    'F': {
-        name: 'dayOfWeekInMonth',
-        format: function (oField, oDate, oFormat) {
-            return '';
         },
-        parse: function () {
-            return {};
+        isNumeric: function (iDigits) {
+            return iDigits < 3;
         }
-    },
-    'E': {
+    }),
+    'F': DateFormat._createPatternSymbol({ name: 'dayOfWeekInMonth' }),
+    'E': DateFormat._createPatternSymbol({
         name: 'dayNameInWeek',
         format: function (oField, oDate, bUTC, oFormat) {
             var iDay = oDate.getUTCDay();
             if (oField.digits < 4) {
                 return oFormat.aDaysAbbrev[iDay];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aDaysWide[iDay];
-            } else if (oField.digits == 5) {
+            } else if (oField.digits === 5) {
                 return oFormat.aDaysNarrow[iDay];
             } else {
                 return oFormat.aDaysShort[iDay];
@@ -978,16 +1002,16 @@ DateFormat.prototype.oSymbols = {
                 }
             }
         }
-    },
-    'c': {
+    }),
+    'c': DateFormat._createPatternSymbol({
         name: 'dayNameInWeekStandalone',
         format: function (oField, oDate, bUTC, oFormat) {
             var iDay = oDate.getUTCDay();
             if (oField.digits < 4) {
                 return oFormat.aDaysAbbrevSt[iDay];
-            } else if (oField.digits == 4) {
+            } else if (oField.digits === 4) {
                 return oFormat.aDaysWideSt[iDay];
-            } else if (oField.digits == 5) {
+            } else if (oField.digits === 5) {
                 return oFormat.aDaysNarrowSt[iDay];
             } else {
                 return oFormat.aDaysShortSt[iDay];
@@ -1015,67 +1039,120 @@ DateFormat.prototype.oSymbols = {
                 }
             }
         }
-    },
-    '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();
-            return oFormat.aDayPeriods[iDayPeriod];
+            if (oField.digits <= 3) {
+                return oFormat.aDayPeriodsAbbrev[iDayPeriod];
+            } else if (oField.digits === 4) {
+                return oFormat.aDayPeriodsWide[iDayPeriod];
+            } else {
+                return oFormat.aDayPeriodsNarrow[iDayPeriod];
+            }
+        },
+        parse: function (sValue, oPart, oFormat, oConfig, sTimezone) {
+            var rAMPM, bAMPMAlternativeCase, oEntry, i, aMatch, normalize, aVariants, aDayPeriodsVariants = [
+                    oFormat.aDayPeriodsWide,
+                    oFormat.aDayPeriodsAbbrev,
+                    oFormat.aDayPeriodsNarrow
+                ];
+            rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
+            aMatch = sValue.match(rAMPM);
+            bAMPMAlternativeCase = aMatch && aMatch.index === 0;
+            function normalize(sValue) {
+                return sValue.replace(/[\x20\xA0]/g, '').replace(/\./g, '');
+            }
+            if (bAMPMAlternativeCase) {
+                sValue = normalize(sValue);
+            }
+            for (i = 0; i < aDayPeriodsVariants.length; i += 1) {
+                aVariants = aDayPeriodsVariants[i];
+                if (bAMPMAlternativeCase) {
+                    aVariants = aVariants.map(normalize);
+                }
+                oEntry = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
+                if (oEntry.index !== -1) {
+                    return {
+                        pm: oEntry.index === 1,
+                        length: bAMPMAlternativeCase ? aMatch[0].length : oEntry.length
+                    };
+                }
+            }
+            return { valid: false };
+        }
+    }),
+    'B': DateFormat._createPatternSymbol({
+        name: 'flexibleDayPeriod',
+        format: function (oField, oDate, bUTC, oFormat) {
+            var bContainsHour = oFormat.aFormatArray.some(function (oFormatElement) {
+                    return 'hHKk'.includes(oFormatElement.symbol);
+                }), sFlexibleDayPeriod = oFormat.oLocaleData.getFlexibleDayPeriodOfTime(oDate.getUTCHours(), oDate.getUTCMinutes());
+            if (bContainsHour) {
+                if (oField.digits <= 3) {
+                    return oFormat.oFlexibleDayPeriodsAbbrev[sFlexibleDayPeriod];
+                }
+                if (oField.digits === 4) {
+                    return oFormat.oFlexibleDayPeriodsWide[sFlexibleDayPeriod];
+                }
+                return oFormat.oFlexibleDayPeriodsNarrow[sFlexibleDayPeriod];
+            }
+            if (oField.digits <= 3) {
+                return oFormat.oFlexibleDayPeriodsAbbrevSt[sFlexibleDayPeriod];
+            }
+            if (oField.digits === 4) {
+                return oFormat.oFlexibleDayPeriodsWideSt[sFlexibleDayPeriod];
+            }
+            return oFormat.oFlexibleDayPeriodsNarrowSt[sFlexibleDayPeriod];
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var bPM;
-            var iLength;
-            var sAM = oFormat.aDayPeriods[0], sPM = oFormat.aDayPeriods[1];
-            var rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
-            var aMatch = sValue.match(rAMPM);
-            var bVariant = aMatch && aMatch.index === 0;
-            if (bVariant) {
-                sValue = aMatch[0];
-                sAM = sAM.replace(/[\x20\xA0]/g, '');
-                sPM = sPM.replace(/[\x20\xA0]/g, '');
-                sValue = sValue.replace(/[\x20\xA0]/g, '');
-                sAM = sAM.replace(/\./g, '').toLowerCase();
-                sPM = sPM.replace(/\./g, '').toLowerCase();
-                sValue = sValue.replace(/\./g, '').toLowerCase();
-            }
-            if (sValue.indexOf(sAM) === 0) {
-                bPM = false;
-                iLength = bVariant ? aMatch[0].length : sAM.length;
-            } else if (sValue.indexOf(sPM) === 0) {
-                bPM = true;
-                iLength = bVariant ? aMatch[0].length : sPM.length;
+            var i, oFound, oVariant, bContainsHour = oFormat.aFormatArray.some(function (oFormatElement) {
+                    return 'hHKk'.includes(oFormatElement.symbol);
+                }), aFlexibleDayPeriodVariants = [
+                    oFormat.oFlexibleDayPeriodsWide,
+                    oFormat.oFlexibleDayPeriodsAbbrev,
+                    oFormat.oFlexibleDayPeriodsNarrow
+                ];
+            if (bContainsHour) {
+                for (i = 0; i < aFlexibleDayPeriodVariants.length; i++) {
+                    oVariant = aFlexibleDayPeriodVariants[i];
+                    oFound = oParseHelper.findEntry(sValue, Object.values(oVariant), oFormat.oLocaleData.sCLDRLocaleId);
+                    if (oFound.index !== -1) {
+                        return {
+                            flexDayPeriod: Object.keys(oVariant)[oFound.index],
+                            length: oFound.length
+                        };
+                    }
+                }
             }
-            return {
-                pm: bPM,
-                length: iLength
-            };
+            return { valid: false };
         }
-    },
-    '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;
             }
@@ -1084,9 +1161,10 @@ DateFormat.prototype.oSymbols = {
                 length: sPart.length,
                 valid: bValid
             };
-        }
-    },
-    'k': {
+        },
+        isNumeric: true
+    }),
+    'k': DateFormat._createPatternSymbol({
         name: 'hour1_24',
         format: function (oField, oDate) {
             var iHours = oDate.getUTCHours();
@@ -1094,11 +1172,8 @@ DateFormat.prototype.oSymbols = {
             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);
-            if (iHours == 24) {
+            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;
             }
             if (oConfig.strict && iHours > 23) {
@@ -1109,9 +1184,10 @@ DateFormat.prototype.oSymbols = {
                 length: sPart.length,
                 valid: bValid
             };
-        }
-    },
-    'K': {
+        },
+        isNumeric: true
+    }),
+    'K': DateFormat._createPatternSymbol({
         name: 'hour0_11',
         format: function (oField, oDate) {
             var iHours = oDate.getUTCHours();
@@ -1119,10 +1195,7 @@ DateFormat.prototype.oSymbols = {
             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;
             }
@@ -1131,16 +1204,17 @@ DateFormat.prototype.oSymbols = {
                 length: sPart.length,
                 valid: bValid
             };
-        }
-    },
-    'h': {
+        },
+        isNumeric: true
+    }),
+    'h': DateFormat._createPatternSymbol({
         name: 'hour1_12',
         format: function (oField, oDate) {
             var iHours = oDate.getUTCHours();
             var sHours;
             if (iHours > 12) {
                 sHours = String(iHours - 12);
-            } else if (iHours == 0) {
+            } else if (iHours === 0) {
                 sHours = '12';
             } else {
                 sHours = String(iHours);
@@ -1148,11 +1222,8 @@ DateFormat.prototype.oSymbols = {
             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 bValid = oParseHelper.checkValid(oPart.type, sPart === '', oFormat);
-            if (iHours == 12) {
+            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);
+            if (iHours === 12) {
                 iHours = 0;
                 bPM = bPM === undefined ? true : bPM;
             }
@@ -1165,19 +1236,17 @@ DateFormat.prototype.oSymbols = {
                 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;
             }
@@ -1186,19 +1255,17 @@ DateFormat.prototype.oSymbols = {
                 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;
             }
@@ -1207,9 +1274,10 @@ DateFormat.prototype.oSymbols = {
                 second: iSeconds,
                 valid: bValid
             };
-        }
-    },
-    'S': {
+        },
+        isNumeric: true
+    }),
+    'S': DateFormat._createPatternSymbol({
         name: 'fractionalsecond',
         format: function (oField, oDate) {
             var iMilliseconds = oDate.getUTCMilliseconds();
@@ -1220,18 +1288,19 @@ DateFormat.prototype.oSymbols = {
             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');
             var iMilliseconds = parseInt(sPart);
             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) {
             if (oField.digits > 3 && oDate.getTimezoneLong && oDate.getTimezoneLong()) {
@@ -1245,7 +1314,7 @@ DateFormat.prototype.oSymbols = {
             var bPositiveOffset = iTimezoneOffset > 0;
             var iHourOffset = Math.floor(iTZOffset / 60);
             var iMinuteOffset = Math.floor(iTZOffset % 60);
-            if (!bUTC && iTZOffset != 0) {
+            if (!bUTC && iTZOffset !== 0) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
                 sTimeZone += String(iHourOffset).padStart(2, '0');
                 sTimeZone += ':';
@@ -1279,8 +1348,8 @@ DateFormat.prototype.oSymbols = {
                 tzDiff: iTZDiff
             };
         }
-    },
-    'Z': {
+    }),
+    'Z': DateFormat._createPatternSymbol({
         name: 'timezoneRFC822',
         format: function (oField, oDate, bUTC, oFormat, sTimezone) {
             var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
@@ -1299,8 +1368,8 @@ DateFormat.prototype.oSymbols = {
         parse: function (sValue, oPart, oFormat, oConfig) {
             return oParseHelper.parseTZ(sValue, false);
         }
-    },
-    'X': {
+    }),
+    'X': DateFormat._createPatternSymbol({
         name: 'timezoneISO8601',
         format: function (oField, oDate, bUTC, oFormat, sTimezone) {
             var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
@@ -1309,7 +1378,7 @@ DateFormat.prototype.oSymbols = {
             var iHourOffset = Math.floor(iTZOffset / 60);
             var iMinuteOffset = Math.floor(iTZOffset % 60);
             var sTimeZone = '';
-            if (!bUTC && iTZOffset != 0) {
+            if (!bUTC && iTZOffset !== 0) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
                 sTimeZone += String(iHourOffset).padStart(2, '0');
                 if (oField.digits > 1 || iMinuteOffset > 0) {
@@ -1333,12 +1402,12 @@ DateFormat.prototype.oSymbols = {
                 return oParseHelper.parseTZ(sValue, oPart.digits === 3 || oPart.digits === 5);
             }
         }
-    },
-    'V': {
+    }),
+    'V': DateFormat._createPatternSymbol({
         name: 'timezoneID',
         format: function (oField, oDate, bUTC, oFormat, sTimezone) {
             if (!bUTC && oField.digits === 2) {
-                return sTimezone;
+                return oFormat.oLocaleData.getTimezoneTranslations()[sTimezone] || sTimezone;
             }
             return '';
         },
@@ -1348,24 +1417,33 @@ DateFormat.prototype.oSymbols = {
                 length: 0
             };
             if (oPart.digits === 2) {
-                if (sValue === sTimezone) {
-                    oTimezoneParsed.timezone = sTimezone;
-                    oTimezoneParsed.length = sTimezone.length;
-                    return oTimezoneParsed;
+                var mTimezoneTranslations = oFormat.oLocaleData.getTimezoneTranslations();
+                if (sValue === mTimezoneTranslations[sTimezone]) {
+                    return {
+                        timezone: sTimezone,
+                        length: sValue.length
+                    };
                 }
-                if (sValue) {
-                    var rIanaTimezone = new RegExp('([A-Za-z_])+([/][A-Za-z_]+)+');
-                    var aResult = rIanaTimezone.exec(sValue);
-                    if (aResult && aResult[0] && TimezoneUtil.isValidTimezone(aResult[0])) {
-                        oTimezoneParsed.timezone = aResult[0];
-                        oTimezoneParsed.length = aResult[0].length;
-                        return oTimezoneParsed;
+                var aTimezoneTranslations = Object.values(mTimezoneTranslations);
+                var oTimezoneResult = oParseHelper.findEntry(sValue, aTimezoneTranslations, oFormat.oLocaleData.sCLDRLocaleId);
+                if (oTimezoneResult.index !== -1) {
+                    return {
+                        timezone: Object.keys(mTimezoneTranslations)[oTimezoneResult.index],
+                        length: oTimezoneResult.length
+                    };
+                }
+                var sCurrentValue = '';
+                for (var i = 0; i < sValue.length; i++) {
+                    sCurrentValue += sValue[i];
+                    if (TimezoneUtil.isValidTimezone(sCurrentValue)) {
+                        oTimezoneParsed.timezone = sCurrentValue;
+                        oTimezoneParsed.length = sCurrentValue.length;
                     }
                 }
             }
             return oTimezoneParsed;
         }
-    }
+    })
 };
 DateFormat.prototype._format = function (oJSDate, bUTC, sTimezone) {
     if (this.oFormatOptions.relative) {
@@ -1383,7 +1461,7 @@ DateFormat.prototype._format = function (oJSDate, bUTC, sTimezone) {
         aBuffer.push(this.oSymbols[sSymbol].format(oPart, oDate, bUTC, this, sTimezone));
     }
     sResult = aBuffer.join('');
-    if (Core.getConfiguration().getOriginInfo()) {
+    if (Configuration.getOriginInfo()) {
         sResult = new String(sResult);
         sResult.originInfo = {
             source: 'Common Locale Data Repository',
@@ -1409,7 +1487,7 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
     if (bUTC === undefined) {
         bUTC = this.oFormatOptions.UTC;
     }
-    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
+    sTimezone = sTimezone || Configuration.getTimezone();
     if (Array.isArray(vJSDate)) {
         if (!this.oFormatOptions.interval) {
             Log.error('Non-interval DateFormat can\'t format more than one date instance.');
@@ -1441,7 +1519,7 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
     } else {
         if (!isValidDateObject(vJSDate)) {
             if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE && this.oFormatOptions.pattern.includes('VV')) {
-                return sTimezone;
+                return this.oLocaleData.getTimezoneTranslations()[sTimezone] || sTimezone;
             }
             Log.error('The given date instance isn\'t valid.');
             return '';
@@ -1453,30 +1531,36 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
         vJSDate = convertToTimezone(vJSDate, sTimezone, bUTC);
         sResult = this._format(vJSDate, bUTC, sTimezone);
     }
-    if (sCalendarType == CalendarType.Japanese && this.oLocale.getLanguage() === 'ja') {
+    if (sCalendarType === CalendarType.Japanese && this.oLocale.getLanguage() === 'ja') {
         sResult = sResult.replace(/(^|[^\d])1年/g, '$1元年');
     }
     return sResult;
 };
+DateFormat.prototype._useCustomIntervalDelimiter = function (oDiffFields) {
+    var aTokens;
+    if (!this.oFormatOptions.intervalDelimiter) {
+        return false;
+    }
+    if (this.oFormatOptions.format) {
+        aTokens = this.oLocaleData._parseSkeletonFormat(this.oFormatOptions.format);
+        return aTokens.some(function (oToken) {
+            return oDiffFields[oToken.group];
+        });
+    }
+    return true;
+};
 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 = [];
-    var oDiffField = this._getGreatestDiffField([
-        oFromDate,
-        oToDate
-    ]);
-    if (!oDiffField) {
+    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) {
-        sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffField, sCalendarType);
+    if (this._useCustomIntervalDelimiter(oDiffFields)) {
+        sPattern = this.intervalPatterns[0];
+    } else if (this.oFormatOptions.format) {
+        sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffFields, sCalendarType);
     } else {
         sPattern = this.oLocaleData.getCombinedIntervalPattern(this.oFormatOptions.pattern, sCalendarType);
     }
@@ -1504,7 +1588,7 @@ var mFieldToGroup = {
     Minutes: 'Minute',
     Seconds: 'Second'
 };
-DateFormat.prototype._getGreatestDiffField = function (aDates) {
+DateFormat.prototype._getDiffFields = function (aDates) {
     var bDiffFound = false, mDiff = {};
     this.aIntervalCompareFields.forEach(function (sField) {
         var sGetterPrefix = 'getUTC', sMethodName = sGetterPrefix + sField, sFieldGroup = mFieldToGroup[sField], vFromValue = aDates[0][sMethodName].apply(aDates[0]), vToValue = aDates[1][sMethodName].apply(aDates[1]);
@@ -1519,21 +1603,28 @@ DateFormat.prototype._getGreatestDiffField = function (aDates) {
     return null;
 };
 DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict, sTimezone) {
-    var iIndex = 0, oPart, sSubValue, oResult;
-    var oDateValue = {
-        valid: true,
-        lastTimezonePatternSymbol: ''
-    };
-    var oParseConf = {
-        formatArray: aFormatArray,
-        dateValue: oDateValue,
-        strict: bStrict
-    };
+    var sFlexibleDayPeriod, oNextPart, oPart, bPM, oPrevPart, oResult, sSubValue, oDateValue = {
+            valid: true,
+            lastTimezonePatternSymbol: ''
+        }, iIndex = 0, oParseConf = {
+            formatArray: aFormatArray,
+            dateValue: oDateValue,
+            strict: bStrict
+        }, that = this;
+    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;
-        oResult = this.oSymbols[oPart.symbol || ''].parse(sSubValue, oPart, this, oParseConf, sTimezone) || {};
+        oParseConf.exactLength = isNumeric(oPart) && (isNumeric(oPrevPart) || isNumeric(oNextPart));
+        oResult = getSymbol(oPart).parse(sSubValue, oPart, this, oParseConf, sTimezone) || {};
         if (oResult.tzDiff !== undefined || oResult.timezone) {
             oResult.lastTimezonePatternSymbol = oPart.symbol;
         }
@@ -1544,7 +1635,12 @@ DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict, sTi
         iIndex += oResult.length || 0;
     }
     oDateValue.index = iIndex;
-    if (oDateValue.pm) {
+    bPM = oDateValue.pm;
+    if (oDateValue.flexDayPeriod && oDateValue.hour * 60 + (oDateValue.minute || 0) < 720) {
+        sFlexibleDayPeriod = this.oLocaleData.getFlexibleDayPeriodOfTime(oDateValue.hour + 12, oDateValue.minute || 0);
+        bPM = oDateValue.flexDayPeriod === sFlexibleDayPeriod;
+    }
+    if (bPM) {
         oDateValue.hour += 12;
     }
     if (oDateValue.dayNumberOfWeek === undefined && oDateValue.dayOfWeek !== undefined) {
@@ -1601,13 +1697,24 @@ DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bSt
     }.bind(this));
     return aDateValues;
 };
+function getCalendarWeekParameter(oFormatOptions) {
+    if (oFormatOptions.calendarWeekNumbering) {
+        return oFormatOptions.calendarWeekNumbering;
+    } else if (oFormatOptions.firstDayOfWeek !== undefined && oFormatOptions.minimalDaysInFirstWeek !== undefined) {
+        return {
+            firstDayOfWeek: oFormatOptions.firstDayOfWeek,
+            minimalDaysInFirstWeek: oFormatOptions.minimalDaysInFirstWeek
+        };
+    }
+    return undefined;
+}
 var convertToTimezone = function (oJSDate, sTimezone, bUTC) {
     if (!bUTC && isValidDateObject(oJSDate)) {
         return TimezoneUtil.convertToTimezone(oJSDate, sTimezone);
     }
     return oJSDate;
 };
-var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone) {
+var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone, oFormatOptions, oLocale) {
     if (!oDateValue.valid) {
         return null;
     }
@@ -1628,7 +1735,7 @@ var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone
         oDate.setUTCWeek({
             year: oDateValue.weekYear || oDateValue.year,
             week: oDateValue.week
-        });
+        }, oLocale, getCalendarWeekParameter(oFormatOptions));
         if (oDateValue.dayNumberOfWeek !== undefined) {
             oDate.setUTCDate(oDate.getUTCDate() + oDateValue.dayNumberOfWeek - 1);
         }
@@ -1643,7 +1750,7 @@ var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone
         }
     }
     if (oDateValue.tzDiff) {
-        oDate.setUTCSeconds((oDateValue.second || 0) + oDateValue.tzDiff);
+        oDate.setUTCSeconds(oDate.getUTCSeconds() + oDateValue.tzDiff);
     }
     return oDate;
 };
@@ -1694,11 +1801,11 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
     sValue = sValue == null ? '' : String(sValue).trim();
     var oDateValue;
     var sCalendarType = this.oFormatOptions.calendarType;
-    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
+    sTimezone = sTimezone || Configuration.getTimezone();
     if (bStrict === undefined) {
         bStrict = this.oFormatOptions.strictParsing;
     }
-    if (sCalendarType == CalendarType.Japanese && this.oLocale.getLanguage() === 'ja') {
+    if (sCalendarType === CalendarType.Japanese && this.oLocale.getLanguage() === 'ja') {
         sValue = sValue.replace(/元年/g, '1年');
     }
     if (!this.oFormatOptions.interval) {
@@ -1710,7 +1817,7 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
         if (oDateValue.index === 0 || oDateValue.index < sValue.length) {
             oDateValue.valid = false;
         }
-        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict, sTimezone);
+        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
         if (oJSDate) {
             if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
                 var bShowTimezone = this.oFormatOptions.showTimezone === undefined || this.oFormatOptions.showTimezone;
@@ -1735,11 +1842,11 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
     } else {
         var aDateValues = this._parseInterval(sValue, sCalendarType, bUTC, bStrict, sTimezone);
         var oJSDate1, oJSDate2;
-        if (aDateValues && aDateValues.length == 2) {
+        if (aDateValues && aDateValues.length === 2) {
             var oDateValue1 = mergeWithoutOverwrite(aDateValues[0], aDateValues[1]);
             var oDateValue2 = mergeWithoutOverwrite(aDateValues[1], aDateValues[0]);
-            oJSDate1 = fnCreateDate(oDateValue1, sCalendarType, bUTC, bStrict, sTimezone);
-            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict, sTimezone);
+            oJSDate1 = fnCreateDate(oDateValue1, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
+            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
             if (oJSDate1 && oJSDate2) {
                 if (this.oFormatOptions.singleIntervalValue && oJSDate1.getTime() === oJSDate2.getTime()) {
                     return [
@@ -1762,7 +1869,7 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
             }
         }
     }
-    if (!this.bIsFallback) {
+    if (this.aFallbackFormats) {
         var vDate;
         this.aFallbackFormats.every(function (oFallbackFormat) {
             vDate = oFallbackFormat.parse(sValue, bUTCInputParameter, bStrict);
@@ -1794,20 +1901,20 @@ DateFormat.prototype.parseCldrDatePattern = function (sPattern) {
     for (i = 0; i < sPattern.length; i++) {
         var sCurChar = sPattern.charAt(i), sNextChar, sPrevChar, sPrevPrevChar;
         if (bQuoted) {
-            if (sCurChar == '\'') {
+            if (sCurChar === '\'') {
                 sPrevChar = sPattern.charAt(i - 1);
                 sPrevPrevChar = sPattern.charAt(i - 2);
                 sNextChar = sPattern.charAt(i + 1);
-                if (sPrevChar == '\'' && sPrevPrevChar != '\'') {
+                if (sPrevChar === '\'' && sPrevPrevChar !== '\'') {
                     bQuoted = false;
-                } else if (sNextChar == '\'') {
+                } else if (sNextChar === '\'') {
                     i += 1;
                 } else {
                     bQuoted = false;
                     continue;
                 }
             }
-            if (sState == 'text') {
+            if (sState === 'text') {
                 oCurrentObject.value += sCurChar;
             } else {
                 oCurrentObject = {
@@ -1818,11 +1925,11 @@ DateFormat.prototype.parseCldrDatePattern = function (sPattern) {
                 sState = 'text';
             }
         } else {
-            if (sCurChar == '\'') {
+            if (sCurChar === '\'') {
                 bQuoted = true;
             } else if (this.oSymbols[sCurChar]) {
                 sNewState = this.oSymbols[sCurChar].name;
-                if (sState == sNewState) {
+                if (sState === sNewState) {
                     oCurrentObject.digits++;
                 } else {
                     oCurrentObject = {
@@ -1842,7 +1949,7 @@ DateFormat.prototype.parseCldrDatePattern = function (sPattern) {
                     }
                 }
             } else {
-                if (sState == 'text') {
+                if (sState === 'text') {
                     oCurrentObject.value += sCurChar;
                 } else {
                     oCurrentObject = {
@@ -1878,57 +1985,78 @@ DateFormat.prototype.parseRelative = function (sValue, bUTC) {
         }
     }
     function computeRelativeDate(iDiff, sScale) {
-        var iToday, oToday = new Date(), oJSDate;
-        if (bUTC) {
-            iToday = oToday.getTime();
-        } else {
-            iToday = Date.UTC(oToday.getFullYear(), oToday.getMonth(), oToday.getDate(), oToday.getHours(), oToday.getMinutes(), oToday.getSeconds(), oToday.getMilliseconds());
-        }
-        oJSDate = new Date(iToday);
-        switch (sScale) {
-        case 'second':
-            oJSDate.setUTCSeconds(oJSDate.getUTCSeconds() + iDiff);
-            break;
-        case 'minute':
-            oJSDate.setUTCMinutes(oJSDate.getUTCMinutes() + iDiff);
-            break;
-        case 'hour':
-            oJSDate.setUTCHours(oJSDate.getUTCHours() + iDiff);
-            break;
-        case 'day':
-            oJSDate.setUTCDate(oJSDate.getUTCDate() + iDiff);
-            break;
-        case 'week':
-            oJSDate.setUTCDate(oJSDate.getUTCDate() + iDiff * 7);
-            break;
-        case 'month':
-            oJSDate.setUTCMonth(oJSDate.getUTCMonth() + iDiff);
-            break;
-        case 'quarter':
-            oJSDate.setUTCMonth(oJSDate.getUTCMonth() + iDiff * 3);
-            break;
-        case 'year':
-            oJSDate.setUTCFullYear(oJSDate.getUTCFullYear() + iDiff);
-            break;
-        }
+        var oResult = UI5Date.getInstance();
         if (bUTC) {
-            return oJSDate;
+            oResult.setUTCFullYear(oResult.getFullYear(), oResult.getMonth(), oResult.getDate());
+            oResult.setUTCHours(oResult.getHours(), oResult.getMinutes(), oResult.getSeconds(), oResult.getMilliseconds());
+            switch (sScale) {
+            case 'second':
+                oResult.setUTCSeconds(oResult.getUTCSeconds() + iDiff);
+                break;
+            case 'minute':
+                oResult.setUTCMinutes(oResult.getUTCMinutes() + iDiff);
+                break;
+            case 'hour':
+                oResult.setUTCHours(oResult.getUTCHours() + iDiff);
+                break;
+            case 'day':
+                oResult.setUTCDate(oResult.getUTCDate() + iDiff);
+                break;
+            case 'week':
+                oResult.setUTCDate(oResult.getUTCDate() + iDiff * 7);
+                break;
+            case 'month':
+                oResult.setUTCMonth(oResult.getUTCMonth() + iDiff);
+                break;
+            case 'quarter':
+                oResult.setUTCMonth(oResult.getUTCMonth() + iDiff * 3);
+                break;
+            case 'year':
+                oResult.setUTCFullYear(oResult.getUTCFullYear() + iDiff);
+                break;
+            }
         } else {
-            return new Date(oJSDate.getUTCFullYear(), oJSDate.getUTCMonth(), oJSDate.getUTCDate(), oJSDate.getUTCHours(), oJSDate.getUTCMinutes(), oJSDate.getUTCSeconds(), oJSDate.getUTCMilliseconds());
+            switch (sScale) {
+            case 'second':
+                oResult.setSeconds(oResult.getSeconds() + iDiff);
+                break;
+            case 'minute':
+                oResult.setMinutes(oResult.getMinutes() + iDiff);
+                break;
+            case 'hour':
+                oResult.setHours(oResult.getHours() + iDiff);
+                break;
+            case 'day':
+                oResult.setDate(oResult.getDate() + iDiff);
+                break;
+            case 'week':
+                oResult.setDate(oResult.getDate() + iDiff * 7);
+                break;
+            case 'month':
+                oResult.setMonth(oResult.getMonth() + iDiff);
+                break;
+            case 'quarter':
+                oResult.setMonth(oResult.getMonth() + iDiff * 3);
+                break;
+            case 'year':
+                oResult.setFullYear(oResult.getFullYear() + iDiff);
+                break;
+            }
         }
+        return oResult;
     }
 };
 DateFormat.prototype.formatRelative = function (oJSDate, bUTC, aRange, sTimezone) {
-    var oToday = convertToTimezone(new Date(), sTimezone), oDateUTC, sScale = this.oFormatOptions.relativeScale || 'day', iDiff, sPattern, iDiffSeconds;
+    var oDateUTC, iDiff, iDiffSeconds, sPattern, oToday = convertToTimezone(new Date(), sTimezone), sScale = this.oFormatOptions.relativeScale || 'day';
     iDiffSeconds = (oJSDate.getTime() - oToday.getTime()) / 1000;
-    if (this.oFormatOptions.relativeScale == 'auto') {
+    if (this.oFormatOptions.relativeScale === 'auto') {
         sScale = this._getScale(iDiffSeconds, this.aRelativeScales);
         sScale = fixScaleForMonths(oJSDate, oToday, sScale, iDiffSeconds);
     }
     if (!aRange) {
         aRange = this._mRanges[sScale];
     }
-    if (sScale == 'year' || sScale == 'month' || sScale == 'day') {
+    if (sScale === 'year' || sScale === 'month' || sScale === 'day') {
         oToday = new Date(Date.UTC(oToday.getUTCFullYear(), oToday.getUTCMonth(), oToday.getUTCDate()));
         oDateUTC = new Date(0);
         oDateUTC.setUTCFullYear(oJSDate.getUTCFullYear(), oJSDate.getUTCMonth(), oJSDate.getUTCDate());
@@ -1938,7 +2066,7 @@ DateFormat.prototype.formatRelative = function (oJSDate, bUTC, aRange, sTimezone
         oToday,
         oJSDate
     ]);
-    if (this.oFormatOptions.relativeScale != 'auto' && (iDiff < aRange[0] || iDiff > aRange[1])) {
+    if (this.oFormatOptions.relativeScale !== 'auto' && (iDiff < aRange[0] || iDiff > aRange[1])) {
         return null;
     }
     sPattern = this.oLocaleData.getRelativePattern(sScale, iDiff, iDiffSeconds > 0, this.oFormatOptions.relativeStyle);
@@ -2015,7 +2143,7 @@ function fixScaleForMonths(oJSDate, oToday, sScale, iDiffSeconds) {
     return sScale;
 }
 function cutDateFields(oDate, iStartIndex) {
-    var aFields = [
+    var sMethodName, aFields = [
             'FullYear',
             'Month',
             'Date',
@@ -2023,8 +2151,7 @@ function cutDateFields(oDate, iStartIndex) {
             'Minutes',
             'Seconds',
             'Milliseconds'
-        ], sMethodName;
-    var oDateCopy = new Date(oDate.getTime());
+        ], oDateCopy = new Date(oDate.getTime());
     for (var i = iStartIndex; i < aFields.length; i++) {
         sMethodName = 'setUTC' + aFields[iStartIndex];
         oDateCopy[sMethodName].apply(oDateCopy, [0]);
@@ -2067,7 +2194,12 @@ var mRelativeDiffs = {
     }
 };
 DateFormat.prototype._adaptDayOfWeek = function (iDayOfWeek) {
-    var iFirstDayOfWeek = LocaleData.getInstance(Core.getConfiguration().getFormatSettings().getFormatLocale()).getFirstDayOfWeek();
+    var vCalendarWeekParameter = getCalendarWeekParameter(this.oFormatOptions), iFirstDayOfWeek;
+    if (typeof vCalendarWeekParameter === 'object') {
+        iFirstDayOfWeek = vCalendarWeekParameter.firstDayOfWeek;
+    } else {
+        iFirstDayOfWeek = CalendarUtils.getWeekConfigurationValues(vCalendarWeekParameter, this.oLocale).firstDayOfWeek;
+    }
     var iDayNumberOfWeek = iDayOfWeek - (iFirstDayOfWeek - 1);
     if (iDayNumberOfWeek <= 0) {
         iDayNumberOfWeek += 7;
@@ -2133,4 +2265,28 @@ DateFormat.prototype.getAllowedCharacters = function (aFormatArray) {
     }
     return sAllowedCharacters;
 };
+DateFormat.prototype.getPlaceholderText = function () {
+    var oResourceBundle = Core.getLibraryResourceBundle();
+    return oResourceBundle.getText('date.placeholder', [this.format.apply(this, this.getSampleValue())]);
+};
+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];
+};
 export default DateFormat;