@ui5/webcomponents-localization 1.3.1 → 1.4.0

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

@@ -3,6 +3,7 @@ import CalendarType from '../CalendarType.js';
 import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.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';
@@ -10,8 +11,20 @@ import extend from '../../../base/util/extend.js';
 var DateFormat = function () {
     throw new Error();
 };
+var mDateFormatTypes = {
+    DATE: 'date',
+    TIME: 'time',
+    DATETIME: 'datetime',
+    DATETIME_WITH_TIMEZONE: 'datetimeWithTimezone'
+};
 var mCldrDatePattern = {};
+var checkTimezoneParameterType = function (sTimezone) {
+    if (typeof sTimezone !== 'string' && !(sTimezone instanceof String) && sTimezone != null) {
+        throw new TypeError('The given timezone must be a string.');
+    }
+};
 DateFormat.oDateInfo = {
+    type: mDateFormatTypes.DATE,
     oDefaultFormatOptions: {
         style: 'medium',
         relativeScale: 'day',
@@ -64,6 +77,7 @@ DateFormat.oDateInfo = {
     ]
 };
 DateFormat.oDateTimeInfo = {
+    type: mDateFormatTypes.DATETIME,
     oDefaultFormatOptions: {
         style: 'medium',
         relativeScale: 'auto',
@@ -126,7 +140,41 @@ DateFormat.oDateTimeInfo = {
         'Seconds'
     ]
 };
+DateFormat._getDateTimeWithTimezoneInfo = function (oFormatOptions) {
+    var bShowDate = oFormatOptions.showDate === undefined || oFormatOptions.showDate;
+    var bShowTime = oFormatOptions.showTime === undefined || oFormatOptions.showTime;
+    var bShowTimezone = oFormatOptions.showTimezone === undefined || oFormatOptions.showTimezone;
+    var oBaselineType = DateFormat.oDateTimeInfo;
+    if (bShowDate && !bShowTime) {
+        oBaselineType = DateFormat.oDateInfo;
+    } else if (!bShowDate && bShowTime) {
+        oBaselineType = DateFormat.oTimeInfo;
+    }
+    return Object.assign({}, oBaselineType, {
+        type: mDateFormatTypes.DATETIME_WITH_TIMEZONE,
+        getTimezonePattern: function (sPattern) {
+            if (!bShowDate && !bShowTime && bShowTimezone) {
+                return 'VV';
+            } else if (!bShowTimezone) {
+                return sPattern;
+            } else {
+                return sPattern + ' VV';
+            }
+        },
+        getPattern: function (oLocaleData, sStyle, sCalendarType) {
+            if (!bShowDate && !bShowTime && bShowTimezone) {
+                return 'VV';
+            }
+            if (!bShowTimezone) {
+                return oBaselineType.getPattern(oLocaleData, sStyle, sCalendarType);
+            }
+            var sPattern = oBaselineType.getPattern(oLocaleData, sStyle, sCalendarType);
+            return oLocaleData.applyTimezonePattern(sPattern);
+        }
+    });
+};
 DateFormat.oTimeInfo = {
+    type: mDateFormatTypes.TIME,
     oDefaultFormatOptions: {
         style: 'medium',
         relativeScale: 'auto',
@@ -179,6 +227,27 @@ DateFormat.getDateInstance = function (oFormatOptions, oLocale) {
 DateFormat.getDateTimeInstance = function (oFormatOptions, oLocale) {
     return this.createInstance(oFormatOptions, oLocale, this.oDateTimeInfo);
 };
+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;
+                }
+            }
+            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.');
+        }
+    }
+    return this.createInstance(oFormatOptions, oLocale, DateFormat._getDateTimeWithTimezoneInfo(oFormatOptions || {}));
+};
 DateFormat.getTimeInstance = function (oFormatOptions, oLocale) {
     return this.createInstance(oFormatOptions, oLocale, this.oTimeInfo);
 };
@@ -199,6 +268,16 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
     oFormat.oLocale = oLocale;
     oFormat.oLocaleData = LocaleData.getInstance(oLocale);
     oFormat.oFormatOptions = extend({}, oInfo.oDefaultFormatOptions, oFormatOptions);
+    if (oInfo.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+        oFormat.oFormatOptions.interval = false;
+        oFormat.oFormatOptions.singleIntervalValue = false;
+        oFormat.oFormatOptions.UTC = false;
+    } else {
+        oFormat.oFormatOptions.showTimezone = undefined;
+        oFormat.oFormatOptions.showDate = undefined;
+        oFormat.oFormatOptions.showTime = undefined;
+    }
+    oFormat.type = oInfo.type;
     if (!oFormat.oFormatOptions.calendarType) {
         oFormat.oFormatOptions.calendarType = Core.getConfiguration().getCalendarType();
     }
@@ -246,7 +325,7 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
             if (oFormat.oFormatOptions.pattern && oInfo.bPatternFallbackWithoutDelimiter) {
                 aFallbackFormatOptions = DateFormat._createFallbackOptionsWithoutDelimiter(oFormat.oFormatOptions.pattern).concat(aFallbackFormatOptions);
             }
-            oFallbackFormats = DateFormat._createFallbackFormat(aFallbackFormatOptions, sCalendarType, oLocale, oInfo, oFormat.oFormatOptions.interval);
+            oFallbackFormats = DateFormat._createFallbackFormat(aFallbackFormatOptions, sCalendarType, oLocale, oInfo, oFormat.oFormatOptions);
         }
         oFormat.aFallbackFormats = oFallbackFormats;
     }
@@ -286,10 +365,16 @@ DateFormat.prototype.init = function () {
     this.aFormatArray = this.parseCldrDatePattern(this.oFormatOptions.pattern);
     this.sAllowedCharacters = this.getAllowedCharacters(this.aFormatArray);
 };
-DateFormat._createFallbackFormat = function (aFallbackFormatOptions, sCalendarType, oLocale, oInfo, bInterval) {
+DateFormat._createFallbackFormat = function (aFallbackFormatOptions, sCalendarType, oLocale, oInfo, oParentFormatOptions) {
     return aFallbackFormatOptions.map(function (oOptions) {
         var oFormatOptions = Object.assign({}, oOptions);
-        if (bInterval) {
+        oFormatOptions.showDate = oParentFormatOptions.showDate;
+        oFormatOptions.showTime = oParentFormatOptions.showTime;
+        oFormatOptions.showTimezone = oParentFormatOptions.showTimezone;
+        if (typeof oInfo.getTimezonePattern === 'function' && oFormatOptions.pattern) {
+            oFormatOptions.pattern = oInfo.getTimezonePattern(oFormatOptions.pattern);
+        }
+        if (oParentFormatOptions.interval) {
             oFormatOptions.interval = true;
         }
         oFormatOptions.calendarType = sCalendarType;
@@ -337,17 +422,32 @@ var oParseHelper = {
         }
         return sValue.substr(0, iLength);
     },
-    findEntry: function (sValue, aList) {
+    startsWithIgnoreCase: function (sValue, sSubstring, sLocale) {
+        if (sValue.startsWith(sSubstring)) {
+            return true;
+        }
+        try {
+            var sSubToLocaleUpperCase = sSubstring.toLocaleUpperCase(sLocale);
+            var sValueUpperCase = sValue.toLocaleUpperCase(sLocale);
+            if (sSubToLocaleUpperCase.length !== sSubstring.length || sValueUpperCase.length !== sValue.length) {
+                return false;
+            }
+            return sValueUpperCase.startsWith(sSubToLocaleUpperCase);
+        } catch (e) {
+            return false;
+        }
+    },
+    findEntry: function (sValue, aList, sLocale) {
         var iFoundIndex = -1, iMatchedLength = 0;
         for (var j = 0; j < aList.length; j++) {
-            if (aList[j] && aList[j].length > iMatchedLength && sValue.indexOf(aList[j]) === 0) {
+            if (aList[j] && aList[j].length > iMatchedLength && this.startsWithIgnoreCase(sValue, aList[j], sLocale)) {
                 iFoundIndex = j;
                 iMatchedLength = aList[j].length;
             }
         }
         return {
             index: iFoundIndex,
-            value: iFoundIndex === -1 ? null : aList[iFoundIndex]
+            length: iMatchedLength
         };
     },
     parseTZ: function (sValue, bColonSeparated) {
@@ -369,7 +469,7 @@ var oParseHelper = {
         }
         return {
             length: iLength,
-            tzDiff: (iTZDiff + 60 * iTZDiffHour) * iTZFactor
+            tzDiff: (iTZDiff + 60 * iTZDiffHour) * 60 * iTZFactor
         };
     },
     checkValid: function (sType, bPartInvalid, oFormat) {
@@ -381,7 +481,7 @@ var oParseHelper = {
 DateFormat.prototype.oSymbols = {
     '': {
         name: 'text',
-        format: function (oField, oDate, bUTC, oFormat) {
+        format: function (oField, oDate) {
             return oField.value;
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -425,7 +525,7 @@ DateFormat.prototype.oSymbols = {
     'G': {
         name: 'era',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iEra = bUTC ? oDate.getUTCEra() : oDate.getEra();
+            var iEra = oDate.getUTCEra();
             if (oField.digits <= 3) {
                 return oFormat.aErasAbbrev[iEra];
             } else if (oField.digits === 4) {
@@ -442,11 +542,11 @@ DateFormat.prototype.oSymbols = {
             ];
             for (var i = 0; i < aErasVariants.length; i++) {
                 var aVariants = aErasVariants[i];
-                var oFound = oParseHelper.findEntry(sValue, aVariants);
+                var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                 if (oFound.index !== -1) {
                     return {
                         era: oFound.index,
-                        length: oFound.value.length
+                        length: oFound.length
                     };
                 }
             }
@@ -459,7 +559,7 @@ DateFormat.prototype.oSymbols = {
     'y': {
         name: 'year',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iYear = bUTC ? oDate.getUTCFullYear() : oDate.getFullYear();
+            var iYear = oDate.getUTCFullYear();
             var sYear = String(iYear);
             var sCalendarType = oFormat.oFormatOptions.calendarType;
             if (oField.digits == 2 && sYear.length > 2) {
@@ -482,7 +582,7 @@ DateFormat.prototype.oSymbols = {
             }
             var iYear = parseInt(sPart);
             if (sCalendarType != CalendarType.Japanese && sPart.length <= 2) {
-                var oCurrentDate = UniversalDate.getInstance(new Date(), sCalendarType), iCurrentYear = oCurrentDate.getFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iYear - iCurrentYear;
+                var oCurrentDate = UniversalDate.getInstance(new Date(), 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) {
@@ -501,7 +601,7 @@ DateFormat.prototype.oSymbols = {
     'Y': {
         name: 'weekYear',
         format: function (oField, oDate, bUTC, oFormat) {
-            var oWeek = bUTC ? oDate.getUTCWeek() : oDate.getWeek();
+            var oWeek = oDate.getUTCWeek();
             var iWeekYear = oWeek.year;
             var sWeekYear = String(iWeekYear);
             var sCalendarType = oFormat.oFormatOptions.calendarType;
@@ -524,9 +624,9 @@ DateFormat.prototype.oSymbols = {
                 sPart = oParseHelper.findNumbers(sValue, oPart.digits);
             }
             var iYear = parseInt(sPart);
-            var iWeekYear;
+            var iWeekYear = iYear;
             if (sCalendarType != CalendarType.Japanese && sPart.length <= 2) {
-                var oCurrentDate = UniversalDate.getInstance(new Date(), sCalendarType), iCurrentYear = oCurrentDate.getFullYear(), iCurrentCentury = Math.floor(iCurrentYear / 100), iYearDiff = iCurrentCentury * 100 + iWeekYear - iCurrentYear;
+                var oCurrentDate = UniversalDate.getInstance(new Date(), 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) {
@@ -546,7 +646,7 @@ DateFormat.prototype.oSymbols = {
     'M': {
         name: 'month',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iMonth = bUTC ? oDate.getUTCMonth() : oDate.getMonth();
+            var iMonth = oDate.getUTCMonth();
             if (oField.digits == 3) {
                 return oFormat.aMonthsAbbrev[iMonth];
             } else if (oField.digits == 4) {
@@ -579,11 +679,11 @@ DateFormat.prototype.oSymbols = {
             } else {
                 for (var i = 0; i < aMonthsVariants.length; i++) {
                     var aVariants = aMonthsVariants[i];
-                    var oFound = oParseHelper.findEntry(sValue, aVariants);
+                    var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                     if (oFound.index !== -1) {
                         return {
                             month: oFound.index,
-                            length: oFound.value.length
+                            length: oFound.length
                         };
                     }
                 }
@@ -599,7 +699,7 @@ DateFormat.prototype.oSymbols = {
     'L': {
         name: 'monthStandalone',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iMonth = bUTC ? oDate.getUTCMonth() : oDate.getMonth();
+            var iMonth = oDate.getUTCMonth();
             if (oField.digits == 3) {
                 return oFormat.aMonthsAbbrevSt[iMonth];
             } else if (oField.digits == 4) {
@@ -632,11 +732,11 @@ DateFormat.prototype.oSymbols = {
             } else {
                 for (var i = 0; i < aMonthsVariants.length; i++) {
                     var aVariants = aMonthsVariants[i];
-                    var oFound = oParseHelper.findEntry(sValue, aVariants);
+                    var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                     if (oFound.index !== -1) {
                         return {
                             month: oFound.index,
-                            length: oFound.value.length
+                            length: oFound.length
                         };
                     }
                 }
@@ -652,7 +752,7 @@ DateFormat.prototype.oSymbols = {
     'w': {
         name: 'weekInYear',
         format: function (oField, oDate, bUTC, oFormat) {
-            var oWeek = bUTC ? oDate.getUTCWeek() : oDate.getWeek();
+            var oWeek = oDate.getUTCWeek();
             var iWeek = oWeek.week;
             var sWeek = String(iWeek + 1);
             if (oField.digits < 3) {
@@ -674,11 +774,11 @@ DateFormat.prototype.oSymbols = {
                 bValid = oParseHelper.checkValid(oPart.type, !sPart, oFormat);
             } else {
                 sPart = oFormat.oLocaleData.getCalendarWeek(oPart.digits === 3 ? 'narrow' : 'wide');
-                sPart = sPart.replace('{0}', '[0-9]+');
+                sPart = sPart.replace('{0}', '([0-9]+)');
                 var rWeekNumber = new RegExp(sPart), oResult = rWeekNumber.exec(sValue);
                 if (oResult) {
                     iLength = oResult[0].length;
-                    iWeek = parseInt(oResult[0]) - 1;
+                    iWeek = parseInt(oResult[oResult.length - 1]) - 1;
                 } else {
                     bValid = oParseHelper.checkValid(oPart.type, true, oFormat);
                 }
@@ -692,7 +792,7 @@ DateFormat.prototype.oSymbols = {
     },
     'W': {
         name: 'weekInMonth',
-        format: function (oField, oDate, bUTC, oFormat) {
+        format: function (oField, oDate) {
             return '';
         },
         parse: function () {
@@ -701,7 +801,7 @@ DateFormat.prototype.oSymbols = {
     },
     'D': {
         name: 'dayInYear',
-        format: function (oField, oDate, bUTC, oFormat) {
+        format: function (oField, oDate) {
         },
         parse: function () {
             return {};
@@ -709,8 +809,8 @@ DateFormat.prototype.oSymbols = {
     },
     'd': {
         name: 'day',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iDate = bUTC ? oDate.getUTCDate() : oDate.getDate();
+        format: function (oField, oDate) {
+            var iDate = oDate.getUTCDate();
             return String(iDate).padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -730,7 +830,7 @@ DateFormat.prototype.oSymbols = {
     'Q': {
         name: 'quarter',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iQuarter = bUTC ? oDate.getUTCQuarter() : oDate.getQuarter();
+            var iQuarter = oDate.getUTCQuarter();
             if (oField.digits == 3) {
                 return oFormat.aQuartersAbbrev[iQuarter];
             } else if (oField.digits == 4) {
@@ -763,11 +863,11 @@ DateFormat.prototype.oSymbols = {
             } else {
                 for (var i = 0; i < aQuartersVariants.length; i++) {
                     var aVariants = aQuartersVariants[i];
-                    var oFound = oParseHelper.findEntry(sValue, aVariants);
+                    var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                     if (oFound.index !== -1) {
                         return {
                             quarter: oFound.index,
-                            length: oFound.value.length
+                            length: oFound.length
                         };
                     }
                 }
@@ -783,7 +883,7 @@ DateFormat.prototype.oSymbols = {
     'q': {
         name: 'quarterStandalone',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iQuarter = bUTC ? oDate.getUTCQuarter() : oDate.getQuarter();
+            var iQuarter = oDate.getUTCQuarter();
             if (oField.digits == 3) {
                 return oFormat.aQuartersAbbrevSt[iQuarter];
             } else if (oField.digits == 4) {
@@ -816,11 +916,11 @@ DateFormat.prototype.oSymbols = {
             } else {
                 for (var i = 0; i < aQuartersVariants.length; i++) {
                     var aVariants = aQuartersVariants[i];
-                    var oFound = oParseHelper.findEntry(sValue, aVariants);
+                    var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                     if (oFound.index !== -1) {
                         return {
                             quarter: oFound.index,
-                            length: oFound.value.length
+                            length: oFound.length
                         };
                     }
                 }
@@ -835,7 +935,7 @@ DateFormat.prototype.oSymbols = {
     },
     'F': {
         name: 'dayOfWeekInMonth',
-        format: function (oField, oDate, bUTC, oFormat) {
+        format: function (oField, oDate, oFormat) {
             return '';
         },
         parse: function () {
@@ -845,7 +945,7 @@ DateFormat.prototype.oSymbols = {
     'E': {
         name: 'dayNameInWeek',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iDay = bUTC ? oDate.getUTCDay() : oDate.getDay();
+            var iDay = oDate.getUTCDay();
             if (oField.digits < 4) {
                 return oFormat.aDaysAbbrev[iDay];
             } else if (oField.digits == 4) {
@@ -869,11 +969,11 @@ DateFormat.prototype.oSymbols = {
             ];
             for (var i = 0; i < aDaysVariants.length; i++) {
                 var aVariants = aDaysVariants[i];
-                var oFound = oParseHelper.findEntry(sValue, aVariants);
+                var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                 if (oFound.index !== -1) {
                     return {
                         dayOfWeek: oFound.index,
-                        length: oFound.value.length
+                        length: oFound.length
                     };
                 }
             }
@@ -882,7 +982,7 @@ DateFormat.prototype.oSymbols = {
     'c': {
         name: 'dayNameInWeekStandalone',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iDay = bUTC ? oDate.getUTCDay() : oDate.getDay();
+            var iDay = oDate.getUTCDay();
             if (oField.digits < 4) {
                 return oFormat.aDaysAbbrevSt[iDay];
             } else if (oField.digits == 4) {
@@ -906,11 +1006,11 @@ DateFormat.prototype.oSymbols = {
             ];
             for (var i = 0; i < aDaysVariants.length; i++) {
                 var aVariants = aDaysVariants[i];
-                var oFound = oParseHelper.findEntry(sValue, aVariants);
+                var oFound = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
                 if (oFound.index !== -1) {
                     return {
                         day: oFound.index,
-                        length: oFound.value.length
+                        length: oFound.length
                     };
                 }
             }
@@ -919,7 +1019,7 @@ DateFormat.prototype.oSymbols = {
     'u': {
         name: 'dayNumberOfWeek',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iDay = bUTC ? oDate.getUTCDay() : oDate.getDay();
+            var iDay = oDate.getUTCDay();
             return oFormat._adaptDayOfWeek(iDay);
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -933,7 +1033,7 @@ DateFormat.prototype.oSymbols = {
     'a': {
         name: 'amPmMarker',
         format: function (oField, oDate, bUTC, oFormat) {
-            var iDayPeriod = bUTC ? oDate.getUTCDayPeriod() : oDate.getDayPeriod();
+            var iDayPeriod = oDate.getUTCDayPeriod();
             return oFormat.aDayPeriods[iDayPeriod];
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -967,8 +1067,8 @@ DateFormat.prototype.oSymbols = {
     },
     'H': {
         name: 'hour0_23',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iHours = bUTC ? oDate.getUTCHours() : oDate.getHours();
+        format: function (oField, oDate) {
+            var iHours = oDate.getUTCHours();
             return String(iHours).padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -988,8 +1088,8 @@ DateFormat.prototype.oSymbols = {
     },
     'k': {
         name: 'hour1_24',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iHours = bUTC ? oDate.getUTCHours() : oDate.getHours();
+        format: function (oField, oDate) {
+            var iHours = oDate.getUTCHours();
             var sHours = iHours === 0 ? '24' : String(iHours);
             return sHours.padStart(oField.digits, '0');
         },
@@ -1013,8 +1113,8 @@ DateFormat.prototype.oSymbols = {
     },
     'K': {
         name: 'hour0_11',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iHours = bUTC ? oDate.getUTCHours() : oDate.getHours();
+        format: function (oField, oDate) {
+            var iHours = oDate.getUTCHours();
             var sHours = String(iHours > 11 ? iHours - 12 : iHours);
             return sHours.padStart(oField.digits, '0');
         },
@@ -1035,8 +1135,8 @@ DateFormat.prototype.oSymbols = {
     },
     'h': {
         name: 'hour1_12',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iHours = bUTC ? oDate.getUTCHours() : oDate.getHours();
+        format: function (oField, oDate) {
+            var iHours = oDate.getUTCHours();
             var sHours;
             if (iHours > 12) {
                 sHours = String(iHours - 12);
@@ -1069,8 +1169,8 @@ DateFormat.prototype.oSymbols = {
     },
     'm': {
         name: 'minute',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iMinutes = bUTC ? oDate.getUTCMinutes() : oDate.getMinutes();
+        format: function (oField, oDate) {
+            var iMinutes = oDate.getUTCMinutes();
             return String(iMinutes).padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -1090,8 +1190,8 @@ DateFormat.prototype.oSymbols = {
     },
     's': {
         name: 'second',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iSeconds = bUTC ? oDate.getUTCSeconds() : oDate.getSeconds();
+        format: function (oField, oDate) {
+            var iSeconds = oDate.getUTCSeconds();
             return String(iSeconds).padStart(oField.digits, '0');
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
@@ -1111,8 +1211,8 @@ DateFormat.prototype.oSymbols = {
     },
     'S': {
         name: 'fractionalsecond',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iMilliseconds = bUTC ? oDate.getUTCMilliseconds() : oDate.getMilliseconds();
+        format: function (oField, oDate) {
+            var iMilliseconds = oDate.getUTCMilliseconds();
             var sMilliseconds = String(iMilliseconds);
             var sFractionalseconds = sMilliseconds.padStart(3, '0');
             sFractionalseconds = sFractionalseconds.substr(0, oField.digits);
@@ -1133,17 +1233,18 @@ DateFormat.prototype.oSymbols = {
     },
     'z': {
         name: 'timezoneGeneral',
-        format: function (oField, oDate, bUTC, oFormat) {
+        format: function (oField, oDate, bUTC, oFormat, sTimezone) {
             if (oField.digits > 3 && oDate.getTimezoneLong && oDate.getTimezoneLong()) {
                 return oDate.getTimezoneLong();
             } else if (oDate.getTimezoneShort && oDate.getTimezoneShort()) {
                 return oDate.getTimezoneShort();
             }
+            var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
             var sTimeZone = 'GMT';
-            var iTZOffset = Math.abs(oDate.getTimezoneOffset());
-            var bPositiveOffset = oDate.getTimezoneOffset() > 0;
+            var iTZOffset = Math.abs(iTimezoneOffset / 60);
+            var bPositiveOffset = iTimezoneOffset > 0;
             var iHourOffset = Math.floor(iTZOffset / 60);
-            var iMinuteOffset = iTZOffset % 60;
+            var iMinuteOffset = Math.floor(iTZOffset % 60);
             if (!bUTC && iTZOffset != 0) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
                 sTimeZone += String(iHourOffset).padStart(2, '0');
@@ -1181,11 +1282,12 @@ DateFormat.prototype.oSymbols = {
     },
     'Z': {
         name: 'timezoneRFC822',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iTZOffset = Math.abs(oDate.getTimezoneOffset());
-            var bPositiveOffset = oDate.getTimezoneOffset() > 0;
+        format: function (oField, oDate, bUTC, oFormat, sTimezone) {
+            var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
+            var iTZOffset = Math.abs(iTimezoneOffset / 60);
+            var bPositiveOffset = iTimezoneOffset > 0;
             var iHourOffset = Math.floor(iTZOffset / 60);
-            var iMinuteOffset = iTZOffset % 60;
+            var iMinuteOffset = Math.floor(iTZOffset % 60);
             var sTimeZone = '';
             if (!bUTC) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
@@ -1200,11 +1302,12 @@ DateFormat.prototype.oSymbols = {
     },
     'X': {
         name: 'timezoneISO8601',
-        format: function (oField, oDate, bUTC, oFormat) {
-            var iTZOffset = Math.abs(oDate.getTimezoneOffset());
-            var bPositiveOffset = oDate.getTimezoneOffset() > 0;
+        format: function (oField, oDate, bUTC, oFormat, sTimezone) {
+            var iTimezoneOffset = TimezoneUtil.calculateOffset(oDate, sTimezone);
+            var iTZOffset = Math.abs(iTimezoneOffset / 60);
+            var bPositiveOffset = iTimezoneOffset > 0;
             var iHourOffset = Math.floor(iTZOffset / 60);
-            var iMinuteOffset = iTZOffset % 60;
+            var iMinuteOffset = Math.floor(iTZOffset % 60);
             var sTimeZone = '';
             if (!bUTC && iTZOffset != 0) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
@@ -1230,11 +1333,43 @@ DateFormat.prototype.oSymbols = {
                 return oParseHelper.parseTZ(sValue, oPart.digits === 3 || oPart.digits === 5);
             }
         }
+    },
+    'V': {
+        name: 'timezoneID',
+        format: function (oField, oDate, bUTC, oFormat, sTimezone) {
+            if (!bUTC && oField.digits === 2) {
+                return sTimezone;
+            }
+            return '';
+        },
+        parse: function (sValue, oPart, oFormat, oConfig, sTimezone) {
+            var oTimezoneParsed = {
+                timezone: '',
+                length: 0
+            };
+            if (oPart.digits === 2) {
+                if (sValue === sTimezone) {
+                    oTimezoneParsed.timezone = sTimezone;
+                    oTimezoneParsed.length = sTimezone.length;
+                    return oTimezoneParsed;
+                }
+                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;
+                    }
+                }
+            }
+            return oTimezoneParsed;
+        }
     }
 };
-DateFormat.prototype._format = function (oJSDate, bUTC) {
+DateFormat.prototype._format = function (oJSDate, bUTC, sTimezone) {
     if (this.oFormatOptions.relative) {
-        var sRes = this.formatRelative(oJSDate, bUTC, this.oFormatOptions.relativeRange);
+        var sRes = this.formatRelative(oJSDate, bUTC, this.oFormatOptions.relativeRange, sTimezone);
         if (sRes) {
             return sRes;
         }
@@ -1245,7 +1380,7 @@ DateFormat.prototype._format = function (oJSDate, bUTC) {
     for (var i = 0; i < this.aFormatArray.length; i++) {
         oPart = this.aFormatArray[i];
         sSymbol = oPart.symbol || '';
-        aBuffer.push(this.oSymbols[sSymbol].format(oPart, oDate, bUTC, this));
+        aBuffer.push(this.oSymbols[sSymbol].format(oPart, oDate, bUTC, this, sTimezone));
     }
     sResult = aBuffer.join('');
     if (Core.getConfiguration().getOriginInfo()) {
@@ -1260,10 +1395,21 @@ DateFormat.prototype._format = function (oJSDate, bUTC) {
     return sResult;
 };
 DateFormat.prototype.format = function (vJSDate, bUTC) {
+    var sTimezone;
+    if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+        sTimezone = bUTC;
+        bUTC = false;
+        checkTimezoneParameterType(sTimezone);
+        if (sTimezone && !TimezoneUtil.isValidTimezone(sTimezone)) {
+            Log.error('The given timezone isn\'t valid.');
+            return '';
+        }
+    }
     var sCalendarType = this.oFormatOptions.calendarType, sResult;
     if (bUTC === undefined) {
         bUTC = this.oFormatOptions.UTC;
     }
+    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
     if (Array.isArray(vJSDate)) {
         if (!this.oFormatOptions.interval) {
             Log.error('Non-interval DateFormat can\'t format more than one date instance.');
@@ -1273,27 +1419,30 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
             Log.error('Interval DateFormat can only format with 2 date instances but ' + vJSDate.length + ' is given.');
             return '';
         }
+        vJSDate = vJSDate.map(function (oJSDate) {
+            return convertToTimezone(oJSDate, sTimezone, bUTC);
+        });
         if (this.oFormatOptions.singleIntervalValue) {
             if (vJSDate[0] === null) {
                 Log.error('First date instance which is passed to the interval DateFormat shouldn\'t be null.');
                 return '';
             }
             if (vJSDate[1] === null) {
-                sResult = this._format(vJSDate[0], bUTC);
+                sResult = this._format(vJSDate[0], bUTC, sTimezone);
             }
         }
         if (sResult === undefined) {
-            var bValid = vJSDate.every(function (oJSDate) {
-                return oJSDate && !isNaN(oJSDate.getTime());
-            });
-            if (!bValid) {
+            if (!vJSDate.every(isValidDateObject)) {
                 Log.error('At least one date instance which is passed to the interval DateFormat isn\'t valid.');
                 return '';
             }
             sResult = this._formatInterval(vJSDate, bUTC);
         }
     } else {
-        if (!vJSDate || isNaN(vJSDate.getTime())) {
+        if (!isValidDateObject(vJSDate)) {
+            if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE && this.oFormatOptions.pattern.includes('VV')) {
+                return sTimezone;
+            }
             Log.error('The given date instance isn\'t valid.');
             return '';
         }
@@ -1301,7 +1450,8 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
             Log.error('Interval DateFormat expects an array with two dates for the first argument but only one date is given.');
             return '';
         }
-        sResult = this._format(vJSDate, bUTC);
+        vJSDate = convertToTimezone(vJSDate, sTimezone, bUTC);
+        sResult = this._format(vJSDate, bUTC, sTimezone);
     }
     if (sCalendarType == CalendarType.Japanese && this.oLocale.getLanguage() === 'ja') {
         sResult = sResult.replace(/(^|[^\d])1年/g, '$1元年');
@@ -1321,7 +1471,7 @@ DateFormat.prototype._formatInterval = function (aJSDates, bUTC) {
     var oDiffField = this._getGreatestDiffField([
         oFromDate,
         oToDate
-    ], bUTC);
+    ]);
     if (!oDiffField) {
         return this._format(aJSDates[0], bUTC);
     }
@@ -1354,10 +1504,10 @@ var mFieldToGroup = {
     Minutes: 'Minute',
     Seconds: 'Second'
 };
-DateFormat.prototype._getGreatestDiffField = function (aDates, bUTC) {
+DateFormat.prototype._getGreatestDiffField = function (aDates) {
     var bDiffFound = false, mDiff = {};
     this.aIntervalCompareFields.forEach(function (sField) {
-        var sGetterPrefix = 'get' + (bUTC ? 'UTC' : ''), sMethodName = sGetterPrefix + sField, sFieldGroup = mFieldToGroup[sField], vFromValue = aDates[0][sMethodName].apply(aDates[0]), vToValue = aDates[1][sMethodName].apply(aDates[1]);
+        var sGetterPrefix = 'getUTC', sMethodName = sGetterPrefix + sField, sFieldGroup = mFieldToGroup[sField], vFromValue = aDates[0][sMethodName].apply(aDates[0]), vToValue = aDates[1][sMethodName].apply(aDates[1]);
         if (!deepEqual(vFromValue, vToValue)) {
             bDiffFound = true;
             mDiff[sFieldGroup] = true;
@@ -1368,9 +1518,12 @@ DateFormat.prototype._getGreatestDiffField = function (aDates, bUTC) {
     }
     return null;
 };
-DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict) {
+DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict, sTimezone) {
     var iIndex = 0, oPart, sSubValue, oResult;
-    var oDateValue = { valid: true };
+    var oDateValue = {
+        valid: true,
+        lastTimezonePatternSymbol: ''
+    };
     var oParseConf = {
         formatArray: aFormatArray,
         dateValue: oDateValue,
@@ -1380,7 +1533,10 @@ DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict) {
         sSubValue = sValue.substr(iIndex);
         oPart = aFormatArray[i];
         oParseConf.index = i;
-        oResult = this.oSymbols[oPart.symbol || ''].parse(sSubValue, oPart, this, oParseConf) || {};
+        oResult = this.oSymbols[oPart.symbol || ''].parse(sSubValue, oPart, this, oParseConf, sTimezone) || {};
+        if (oResult.tzDiff !== undefined || oResult.timezone) {
+            oResult.lastTimezonePatternSymbol = oPart.symbol;
+        }
         oDateValue = extend(oDateValue, oResult);
         if (oResult.valid === false) {
             break;
@@ -1400,7 +1556,7 @@ DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict) {
     }
     return oDateValue;
 };
-DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bStrict) {
+DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bStrict, sTimezone) {
     var aDateValues, iRepeat, oDateValue;
     this.intervalPatterns.some(function (sPattern) {
         var aFormatArray = this.parseCldrDatePattern(sPattern);
@@ -1412,7 +1568,7 @@ DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bSt
             }
         }
         if (iRepeat === undefined) {
-            oDateValue = this._parse(sValue, aFormatArray, bUTC, bStrict);
+            oDateValue = this._parse(sValue, aFormatArray, bUTC, bStrict, sTimezone);
             if (oDateValue.index === 0 || oDateValue.index < sValue.length) {
                 oDateValue.valid = false;
             }
@@ -1426,13 +1582,13 @@ DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bSt
             return true;
         } else {
             aDateValues = [];
-            oDateValue = this._parse(sValue, aFormatArray.slice(0, iRepeat), bUTC, bStrict);
+            oDateValue = this._parse(sValue, aFormatArray.slice(0, iRepeat), bUTC, bStrict, sTimezone);
             if (oDateValue.valid === false) {
                 return;
             }
             aDateValues.push(oDateValue);
             var iLength = oDateValue.index;
-            oDateValue = this._parse(sValue.substring(iLength), aFormatArray.slice(iRepeat), bUTC, bStrict);
+            oDateValue = this._parse(sValue.substring(iLength), aFormatArray.slice(iRepeat), bUTC, bStrict, sTimezone);
             if (oDateValue.index === 0 || oDateValue.index + iLength < sValue.length) {
                 oDateValue.valid = false;
             }
@@ -1445,65 +1601,51 @@ DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bSt
     }.bind(this));
     return aDateValues;
 };
-var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict) {
+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) {
+    if (!oDateValue.valid) {
+        return null;
+    }
     var oDate, iYear = typeof oDateValue.year === 'number' ? oDateValue.year : 1970;
-    if (oDateValue.valid) {
-        if (bUTC || oDateValue.tzDiff !== undefined) {
-            oDate = UniversalDate.getInstance(new Date(0), sCalendarType);
-            oDate.setUTCEra(oDateValue.era || UniversalDate.getCurrentEra(sCalendarType));
-            oDate.setUTCFullYear(iYear);
-            oDate.setUTCMonth(oDateValue.month || 0);
-            oDate.setUTCDate(oDateValue.day || 1);
-            oDate.setUTCHours(oDateValue.hour || 0);
-            oDate.setUTCMinutes(oDateValue.minute || 0);
-            oDate.setUTCSeconds(oDateValue.second || 0);
-            oDate.setUTCMilliseconds(oDateValue.millisecond || 0);
-            if (bStrict && (oDateValue.day || 1) !== oDate.getUTCDate()) {
-                oDateValue.valid = false;
-                oDate = undefined;
-            } else {
-                if (oDateValue.tzDiff) {
-                    oDate.setUTCMinutes((oDateValue.minute || 0) + oDateValue.tzDiff);
-                }
-                if (oDateValue.week !== undefined && (oDateValue.month === undefined || oDateValue.day === undefined)) {
-                    oDate.setUTCWeek({
-                        year: oDateValue.weekYear || oDateValue.year,
-                        week: oDateValue.week
-                    });
-                    if (oDateValue.dayNumberOfWeek !== undefined) {
-                        oDate.setUTCDate(oDate.getUTCDate() + oDateValue.dayNumberOfWeek - 1);
-                    }
-                }
-            }
-        } else {
-            oDate = UniversalDate.getInstance(new Date(1970, 0, 1, 0, 0, 0), sCalendarType);
-            oDate.setEra(oDateValue.era || UniversalDate.getCurrentEra(sCalendarType));
-            oDate.setFullYear(iYear);
-            oDate.setMonth(oDateValue.month || 0);
-            oDate.setDate(oDateValue.day || 1);
-            oDate.setHours(oDateValue.hour || 0);
-            oDate.setMinutes(oDateValue.minute || 0);
-            oDate.setSeconds(oDateValue.second || 0);
-            oDate.setMilliseconds(oDateValue.millisecond || 0);
-            if (bStrict && (oDateValue.day || 1) !== oDate.getDate()) {
-                oDateValue.valid = false;
-                oDate = undefined;
-            } else if (oDateValue.week !== undefined && (oDateValue.month === undefined || oDateValue.day === undefined)) {
-                oDate.setWeek({
-                    year: oDateValue.weekYear || oDateValue.year,
-                    week: oDateValue.week
-                });
-                if (oDateValue.dayNumberOfWeek !== undefined) {
-                    oDate.setDate(oDate.getDate() + oDateValue.dayNumberOfWeek - 1);
-                }
-            }
+    oDate = UniversalDate.getInstance(new Date(0), sCalendarType);
+    oDate.setUTCEra(oDateValue.era || UniversalDate.getCurrentEra(sCalendarType));
+    oDate.setUTCFullYear(iYear);
+    oDate.setUTCMonth(oDateValue.month || 0);
+    oDate.setUTCDate(oDateValue.day || 1);
+    oDate.setUTCHours(oDateValue.hour || 0);
+    oDate.setUTCMinutes(oDateValue.minute || 0);
+    oDate.setUTCSeconds(oDateValue.second || 0);
+    oDate.setUTCMilliseconds(oDateValue.millisecond || 0);
+    if (bStrict && (oDateValue.day || 1) !== oDate.getUTCDate()) {
+        return null;
+    }
+    if (oDateValue.week !== undefined && (oDateValue.month === undefined || oDateValue.day === undefined)) {
+        oDate.setUTCWeek({
+            year: oDateValue.weekYear || oDateValue.year,
+            week: oDateValue.week
+        });
+        if (oDateValue.dayNumberOfWeek !== undefined) {
+            oDate.setUTCDate(oDate.getUTCDate() + oDateValue.dayNumberOfWeek - 1);
         }
-        if (oDateValue.valid) {
-            oDate = oDate.getJSDate();
-            return oDate;
+    }
+    oDate = oDate.getJSDate();
+    if (!bUTC && (oDateValue.lastTimezonePatternSymbol === 'V' && oDateValue.timezone || oDateValue.tzDiff === undefined)) {
+        if (oDateValue.timezone) {
+            sTimezone = oDateValue.timezone;
+        }
+        if (sTimezone) {
+            oDateValue.tzDiff = TimezoneUtil.calculateOffset(oDate, sTimezone);
         }
     }
-    return null;
+    if (oDateValue.tzDiff) {
+        oDate.setUTCSeconds((oDateValue.second || 0) + oDateValue.tzDiff);
+    }
+    return oDate;
 };
 function mergeWithoutOverwrite(object1, object2) {
     if (object1 === object2) {
@@ -1526,13 +1668,33 @@ function isValidDateRange(oStartDate, oEndDate) {
     }
     return true;
 }
+function isValidDateObject(oDate) {
+    return oDate && typeof oDate.getTime === 'function' && !isNaN(oDate.getTime());
+}
 DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
+    var bShowDate = this.oFormatOptions.showDate === undefined || this.oFormatOptions.showDate;
+    var bShowTime = this.oFormatOptions.showTime === undefined || this.oFormatOptions.showTime;
+    if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE && (bShowDate && !bShowTime || !bShowDate && bShowTime)) {
+        throw new TypeError('The input can only be parsed back to date if both date and time are supplied.');
+    }
+    var sTimezone;
+    if (bUTC === undefined && this.type !== mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+        bUTC = this.oFormatOptions.UTC;
+    }
+    var bUTCInputParameter = bUTC;
+    if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+        sTimezone = bUTC;
+        bUTC = false;
+        checkTimezoneParameterType(sTimezone);
+        if (sTimezone && !TimezoneUtil.isValidTimezone(sTimezone)) {
+            Log.error('The given timezone isn\'t valid.');
+            return null;
+        }
+    }
     sValue = sValue == null ? '' : String(sValue).trim();
     var oDateValue;
     var sCalendarType = this.oFormatOptions.calendarType;
-    if (bUTC === undefined) {
-        bUTC = this.oFormatOptions.UTC;
-    }
+    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
     if (bStrict === undefined) {
         bStrict = this.oFormatOptions.strictParsing;
     }
@@ -1544,22 +1706,40 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
         if (oJSDate) {
             return oJSDate;
         }
-        oDateValue = this._parse(sValue, this.aFormatArray, bUTC, bStrict);
+        oDateValue = this._parse(sValue, this.aFormatArray, bUTC, bStrict, sTimezone);
         if (oDateValue.index === 0 || oDateValue.index < sValue.length) {
             oDateValue.valid = false;
         }
-        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict);
+        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict, sTimezone);
         if (oJSDate) {
+            if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+                var bShowTimezone = this.oFormatOptions.showTimezone === undefined || this.oFormatOptions.showTimezone;
+                if (!bShowTimezone && bShowDate && bShowTime) {
+                    return [
+                        oJSDate,
+                        undefined
+                    ];
+                } else if (bShowTimezone && !bShowDate && !bShowTime) {
+                    return [
+                        undefined,
+                        oDateValue.timezone
+                    ];
+                }
+                return [
+                    oJSDate,
+                    oDateValue.timezone || undefined
+                ];
+            }
             return oJSDate;
         }
     } else {
-        var aDateValues = this._parseInterval(sValue, sCalendarType, bUTC, bStrict);
+        var aDateValues = this._parseInterval(sValue, sCalendarType, bUTC, bStrict, sTimezone);
         var oJSDate1, oJSDate2;
         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);
-            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict);
+            oJSDate1 = fnCreateDate(oDateValue1, sCalendarType, bUTC, bStrict, sTimezone);
+            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict, sTimezone);
             if (oJSDate1 && oJSDate2) {
                 if (this.oFormatOptions.singleIntervalValue && oJSDate1.getTime() === oJSDate2.getTime()) {
                     return [
@@ -1585,8 +1765,11 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
     if (!this.bIsFallback) {
         var vDate;
         this.aFallbackFormats.every(function (oFallbackFormat) {
-            vDate = oFallbackFormat.parse(sValue, bUTC, bStrict);
+            vDate = oFallbackFormat.parse(sValue, bUTCInputParameter, bStrict);
             if (Array.isArray(vDate)) {
+                if (oFallbackFormat.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+                    return false;
+                }
                 return !(vDate[0] && vDate[1]);
             } else {
                 return !vDate;
@@ -1735,23 +1918,20 @@ DateFormat.prototype.parseRelative = function (sValue, bUTC) {
         }
     }
 };
-DateFormat.prototype.formatRelative = function (oJSDate, bUTC, aRange) {
-    var oToday = new Date(), oDateUTC, sScale = this.oFormatOptions.relativeScale || 'day', iDiff, sPattern, iDiffSeconds;
+DateFormat.prototype.formatRelative = function (oJSDate, bUTC, aRange, sTimezone) {
+    var oToday = convertToTimezone(new Date(), sTimezone), oDateUTC, sScale = this.oFormatOptions.relativeScale || 'day', iDiff, sPattern, iDiffSeconds;
     iDiffSeconds = (oJSDate.getTime() - oToday.getTime()) / 1000;
     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') {
-        oToday = new Date(Date.UTC(oToday.getFullYear(), oToday.getMonth(), oToday.getDate()));
+        oToday = new Date(Date.UTC(oToday.getUTCFullYear(), oToday.getUTCMonth(), oToday.getUTCDate()));
         oDateUTC = new Date(0);
-        if (bUTC) {
-            oDateUTC.setUTCFullYear(oJSDate.getUTCFullYear(), oJSDate.getUTCMonth(), oJSDate.getUTCDate());
-        } else {
-            oDateUTC.setUTCFullYear(oJSDate.getFullYear(), oJSDate.getMonth(), oJSDate.getDate());
-        }
+        oDateUTC.setUTCFullYear(oJSDate.getUTCFullYear(), oJSDate.getUTCMonth(), oJSDate.getUTCDate());
         oJSDate = oDateUTC;
     }
     iDiff = this._getDifference(sScale, [
@@ -1819,6 +1999,21 @@ DateFormat.prototype._getScale = function (iDiffSeconds, aScales) {
     }
     return sScale;
 };
+function fixScaleForMonths(oJSDate, oToday, sScale, iDiffSeconds) {
+    var iMonthDiff = Math.abs(oJSDate.getUTCMonth() - oToday.getUTCMonth());
+    if (sScale === 'week' && iMonthDiff === 2) {
+        return 'month';
+    } else if (sScale === 'week' && iMonthDiff === 1) {
+        if (oJSDate.getUTCDate() === oToday.getUTCDate() || iDiffSeconds < 0 && oJSDate.getUTCDate() < oToday.getUTCDate() || iDiffSeconds > 0 && oJSDate.getUTCDate() > oToday.getUTCDate()) {
+            return 'month';
+        }
+    } else if (sScale === 'month' && iMonthDiff === 1) {
+        if (iDiffSeconds > 0 && oJSDate.getUTCDate() < oToday.getUTCDate() || iDiffSeconds < 0 && oJSDate.getUTCDate() > oToday.getUTCDate()) {
+            return 'week';
+        }
+    }
+    return sScale;
+}
 function cutDateFields(oDate, iStartIndex) {
     var aFields = [
             'FullYear',
@@ -1831,21 +2026,21 @@ function cutDateFields(oDate, iStartIndex) {
         ], sMethodName;
     var oDateCopy = new Date(oDate.getTime());
     for (var i = iStartIndex; i < aFields.length; i++) {
-        sMethodName = 'set' + aFields[iStartIndex];
+        sMethodName = 'setUTC' + aFields[iStartIndex];
         oDateCopy[sMethodName].apply(oDateCopy, [0]);
     }
     return oDateCopy;
 }
 var mRelativeDiffs = {
     year: function (oFromDate, oToDate) {
-        return oToDate.getFullYear() - oFromDate.getFullYear();
+        return oToDate.getUTCFullYear() - oFromDate.getUTCFullYear();
     },
     month: function (oFromDate, oToDate) {
-        return oToDate.getMonth() - oFromDate.getMonth() + this.year(oFromDate, oToDate) * 12;
+        return oToDate.getUTCMonth() - oFromDate.getUTCMonth() + this.year(oFromDate, oToDate) * 12;
     },
     week: function (oFromDate, oToDate, oFormat) {
-        var iFromDay = oFormat._adaptDayOfWeek(oFromDate.getDay());
-        var iToDay = oFormat._adaptDayOfWeek(oToDate.getDay());
+        var iFromDay = oFormat._adaptDayOfWeek(oFromDate.getUTCDay());
+        var iToDay = oFormat._adaptDayOfWeek(oToDate.getUTCDay());
         oFromDate = cutDateFields(oFromDate, 3);
         oToDate = cutDateFields(oToDate, 3);
         return (oToDate.getTime() - oFromDate.getTime() - (iToDay - iFromDay) * oFormat._mScales.day * 1000) / (oFormat._mScales.week * 1000);