@ui5/webcomponents-localization 1.7.4 → 1.7.5

package/dist/sap/base/Log.js

@@ -10,7 +10,7 @@ Log.Level = {
     TRACE: 5,
     ALL: 5 + 1
 };
-var sDefaultComponent, aLog = [], mMaxLevel = { '': Log.Level.ERROR }, iLogEntriesLimit = 3000, oListener = null, bLogSupportInfo = false;
+var aLog = [], mMaxLevel = { '': Log.Level.ERROR }, iLogEntriesLimit = 3000, oListener = null, bLogSupportInfo = false;
 function pad0(i, w) {
     return ('000' + String(i)).slice(-w);
 }
@@ -72,26 +72,26 @@ function getLogEntryListenerInstance() {
     }
     return oListener;
 }
-Log.fatal = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.FATAL, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.fatal = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.FATAL, sMessage, vDetails, sComponent, fnSupportInfo);
 };
-Log.error = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.ERROR, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.error = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.ERROR, sMessage, vDetails, sComponent, fnSupportInfo);
 };
-Log.warning = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.WARNING, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.warning = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.WARNING, sMessage, vDetails, sComponent, fnSupportInfo);
 };
-Log.info = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.INFO, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.info = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.INFO, sMessage, vDetails, sComponent, fnSupportInfo);
 };
-Log.debug = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.DEBUG, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.debug = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.DEBUG, sMessage, vDetails, sComponent, fnSupportInfo);
 };
-Log.trace = function (sMessage, sDetails, sComponent, fnSupportInfo) {
-    log(Log.Level.TRACE, sMessage, sDetails, sComponent, fnSupportInfo);
+Log.trace = function (sMessage, vDetails, sComponent, fnSupportInfo) {
+    log(Log.Level.TRACE, sMessage, vDetails, sComponent, fnSupportInfo);
 };
 Log.setLevel = function (iLogLevel, sComponent, _bDefault) {
-    sComponent = sComponent || sDefaultComponent || '';
+    sComponent = sComponent || '';
     if (!_bDefault || mMaxLevel[sComponent] == null) {
         mMaxLevel[sComponent] = iLogLevel;
         var sLogLevel;
@@ -104,24 +104,23 @@ Log.setLevel = function (iLogLevel, sComponent, _bDefault) {
     }
 };
 Log.getLevel = function (sComponent) {
-    return level(sComponent || sDefaultComponent);
+    return level(sComponent);
 };
 Log.isLoggable = function (iLevel, sComponent) {
-    return (iLevel == null ? Log.Level.DEBUG : iLevel) <= level(sComponent || sDefaultComponent);
+    return (iLevel == null ? Log.Level.DEBUG : iLevel) <= level(sComponent);
 };
 Log.logSupportInfo = function (bEnabled) {
     bLogSupportInfo = bEnabled;
 };
-function log(iLevel, sMessage, sDetails, sComponent, fnSupportInfo) {
-    if (!fnSupportInfo && !sComponent && typeof sDetails === 'function') {
-        fnSupportInfo = sDetails;
-        sDetails = '';
+function log(iLevel, sMessage, vDetails, sComponent, fnSupportInfo) {
+    if (!fnSupportInfo && !sComponent && typeof vDetails === 'function') {
+        fnSupportInfo = vDetails;
+        vDetails = '';
     }
     if (!fnSupportInfo && typeof sComponent === 'function') {
         fnSupportInfo = sComponent;
         sComponent = '';
     }
-    sComponent = sComponent || sDefaultComponent;
     if (iLevel <= level(sComponent)) {
         var fNow = now(), oNow = new Date(fNow), iMicroSeconds = Math.floor((fNow - Math.floor(fNow)) * 1000), oLogEntry = {
                 time: pad0(oNow.getHours(), 2) + ':' + pad0(oNow.getMinutes(), 2) + ':' + pad0(oNow.getSeconds(), 2) + '.' + pad0(oNow.getMilliseconds(), 3) + pad0(iMicroSeconds, 3),
@@ -129,7 +128,7 @@ function log(iLevel, sMessage, sDetails, sComponent, fnSupportInfo) {
                 timestamp: fNow,
                 level: iLevel,
                 message: String(sMessage || ''),
-                details: String(sDetails || ''),
+                details: String(vDetails || ''),
                 component: String(sComponent || '')
             };
         if (bLogSupportInfo && typeof fnSupportInfo === 'function') {
@@ -145,27 +144,27 @@ function log(iLevel, sMessage, sDetails, sComponent, fnSupportInfo) {
             oListener.onLogEntry(oLogEntry);
         }
         if (console) {
-            var isDetailsError = sDetails instanceof Error, logText = oLogEntry.date + ' ' + oLogEntry.time + ' ' + oLogEntry.message + ' - ' + oLogEntry.details + ' ' + oLogEntry.component;
+            var isDetailsError = vDetails instanceof Error, logText = oLogEntry.date + ' ' + oLogEntry.time + ' ' + oLogEntry.message + ' - ' + oLogEntry.details + ' ' + oLogEntry.component;
             switch (iLevel) {
             case Log.Level.FATAL:
             case Log.Level.ERROR:
-                isDetailsError ? console.error(logText, '\n', sDetails) : console.error(logText);
+                isDetailsError ? console.error(logText, '\n', vDetails) : console.error(logText);
                 break;
             case Log.Level.WARNING:
-                isDetailsError ? console.warn(logText, '\n', sDetails) : console.warn(logText);
+                isDetailsError ? console.warn(logText, '\n', vDetails) : console.warn(logText);
                 break;
             case Log.Level.INFO:
                 if (console.info) {
-                    isDetailsError ? console.info(logText, '\n', sDetails) : console.info(logText);
+                    isDetailsError ? console.info(logText, '\n', vDetails) : console.info(logText);
                 } else {
-                    isDetailsError ? console.log(logText, '\n', sDetails) : console.log(logText);
+                    isDetailsError ? console.log(logText, '\n', vDetails) : console.log(logText);
                 }
                 break;
             case Log.Level.DEBUG:
-                isDetailsError ? console.debug(logText, '\n', sDetails) : console.debug(logText);
+                isDetailsError ? console.debug(logText, '\n', vDetails) : console.debug(logText);
                 break;
             case Log.Level.TRACE:
-                isDetailsError ? console.trace(logText, '\n', sDetails) : console.trace(logText);
+                isDetailsError ? console.trace(logText, '\n', vDetails) : console.trace(logText);
                 break;
             }
             if (console.info && oLogEntry.supportInfo) {

package/dist/sap/base/assert.js

@@ -1,8 +1,7 @@
-import Log from './Log.js';
 var fnAssert = function (bResult, vMessage) {
-    if (!bResult) {
-        var sMessage = typeof vMessage === 'function' ? vMessage() : vMessage;
-        console.assert(bResult, sMessage);
-    }
+  if (!bResult) {
+    var sMessage = typeof vMessage === "function" ? vMessage() : vMessage;
+    console.assert(bResult, sMessage);
+  }
 };
-export default fnAssert;
+export default fnAssert;

package/dist/sap/ui/core/Configuration.js

@@ -0,0 +1,21 @@
+import { getLanguage } from "@ui5/webcomponents-base/dist/config/Language.js";
+import { getCalendarType } from "@ui5/webcomponents-base/dist/config/CalendarType.js";
+import getDesigntimePropertyAsArray from "@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js";
+import TimezoneUtil from "./format/TimezoneUtil.js";
+import FormatSettings from "./FormatSettings.js";
+
+const emptyFn = () => { };
+
+/**
+ * OpenUI5 Configuration Shim
+ */
+const Configuration = {
+	getLanguage,
+	getCalendarType,
+	getSupportedLanguages: () => getDesigntimePropertyAsArray("$core-i18n-locales:,ar,bg,ca,cs,da,de,el,en,es,et,fi,fr,hi,hr,hu,it,iw,ja,ko,lt,lv,nl,no,pl,pt,ro,ru,sh,sk,sl,sv,th,tr,uk,vi,zh_CN,zh_TW$"),
+	getOriginInfo: emptyFn,
+	getFormatSettings: () => FormatSettings,
+	getTimezone: () => TimezoneUtil.getLocalTimezone(),
+};
+
+export default Configuration;

package/dist/sap/ui/core/Core.js

@@ -1,33 +1,8 @@
-import { getLanguage } from "@ui5/webcomponents-base/dist/config/Language.js";
-import { getCalendarType } from "@ui5/webcomponents-base/dist/config/CalendarType.js";
-import getDesigntimePropertyAsArray from "@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js";
-import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
-import TimezoneUtil from "./format/TimezoneUtil.js";
+import FormatSettings from "./FormatSettings.js";
+import Configuration from "./Configuration.js";
 
 const emptyFn = () => {};
 
-/**
- * OpenUI5 FormatSettings shim
- */
-const FormatSettings = {
-	getFormatLocale: getLocale,
-	getLegacyDateFormat: emptyFn,
-	getLegacyDateCalendarCustomizing: emptyFn,
-	getCustomLocaleData: emptyFn,
-};
-
-/**
- * OpenUI5 Configuration Shim
- */
-const Configuration = {
-	getLanguage,
-	getCalendarType,
-	getSupportedLanguages: () => getDesigntimePropertyAsArray("$core-i18n-locales:,ar,bg,ca,cs,da,de,el,en,es,et,fi,fr,hi,hr,hu,it,iw,ja,ko,lt,lv,nl,no,pl,pt,ro,ru,sh,sk,sl,sv,th,tr,uk,vi,zh_CN,zh_TW$"),
-	getOriginInfo: emptyFn,
-	getFormatSettings: () => FormatSettings,
-	getTimezone: () => TimezoneUtil.getLocalTimezone(),
-};
-
 /**
  * OpenUI5 Core shim
  */

package/dist/sap/ui/core/FormatSettings.js

@@ -0,0 +1,15 @@
+import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
+
+const emptyFn = () => {};
+
+/**
+ * OpenUI5 FormatSettings shim
+ */
+const FormatSettings = {
+	getFormatLocale: getLocale,
+	getLegacyDateFormat: emptyFn,
+	getLegacyDateCalendarCustomizing: emptyFn,
+	getCustomLocaleData: emptyFn,
+};
+
+export default FormatSettings;

package/dist/sap/ui/core/Locale.js

@@ -75,6 +75,9 @@ var Locale = BaseObject.extend('sap.ui.core.Locale', {
         return M_ISO639_OLD_TO_NEW[this.sLanguage] || this.sLanguage;
     },
     getSAPLogonLanguage: function () {
+        return this._getSAPLogonLanguage();
+    },
+    _getSAPLogonLanguage: function () {
         var sLanguage = this.sLanguage || '';
         if (sLanguage.indexOf('-') >= 0) {
             sLanguage = sLanguage.slice(0, sLanguage.indexOf('-'));

package/dist/sap/ui/core/LocaleData.js

@@ -5,6 +5,7 @@ import CalendarType from './CalendarType.js';
 import Locale from './Locale.js';
 import assert from '../../base/assert.js';
 import LoaderExtensions from '../../base/util/LoaderExtensions.js';
+import Configuration from './Configuration.js';
 var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
     constructor: function (oLocale) {
         this.oLocale = oLocale;
@@ -97,6 +98,56 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         assert(sStyle == 'short' || sStyle == 'medium' || sStyle == 'long' || sStyle == 'full', 'sStyle must be short, medium, long or full');
         return this._get(getCLDRCalendarName(sCalendarType), 'dateFormats', sStyle);
     },
+    getFlexibleDayPeriods: function (sWidth, sCalendarType) {
+        return this._get(getCLDRCalendarName(sCalendarType), 'flexibleDayPeriods', 'format', sWidth);
+    },
+    getFlexibleDayPeriodsStandAlone: function (sWidth, sCalendarType) {
+        return this._get(getCLDRCalendarName(sCalendarType), 'flexibleDayPeriods', 'stand-alone', sWidth);
+    },
+    getFlexibleDayPeriodOfTime: function (iHour, iMinute) {
+        var iAbsoluteMinutes, oDayPeriodRules, sPeriodMatch;
+        iAbsoluteMinutes = (iHour * 60 + iMinute) % 1440;
+        oDayPeriodRules = this._get('dayPeriodRules');
+        function parseToAbsoluteMinutes(sValue) {
+            var aSplit = sValue.split(':'), sHour = aSplit[0], sMinute = aSplit[1];
+            return parseInt(sHour) * 60 + parseInt(sMinute);
+        }
+        sPeriodMatch = Object.keys(oDayPeriodRules).find(function (sDayPeriodRule) {
+            var oDayPeriodRule = oDayPeriodRules[sDayPeriodRule];
+            return oDayPeriodRule['_at'] && parseToAbsoluteMinutes(oDayPeriodRule['_at']) === iAbsoluteMinutes;
+        });
+        if (sPeriodMatch) {
+            return sPeriodMatch;
+        }
+        return Object.keys(oDayPeriodRules).find(function (sDayPeriodRule) {
+            var iEndValue, aIntervals, iStartValue, oDayPeriodRule = oDayPeriodRules[sDayPeriodRule];
+            if (oDayPeriodRule['_at']) {
+                return false;
+            }
+            iStartValue = parseToAbsoluteMinutes(oDayPeriodRule['_from']);
+            iEndValue = parseToAbsoluteMinutes(oDayPeriodRule['_before']);
+            if (iStartValue > iEndValue) {
+                aIntervals = [
+                    {
+                        start: iStartValue,
+                        end: 1440
+                    },
+                    {
+                        start: 0,
+                        end: iEndValue
+                    }
+                ];
+            } else {
+                aIntervals = [{
+                        start: iStartValue,
+                        end: iEndValue
+                    }];
+            }
+            return aIntervals.some(function (oInterval) {
+                return oInterval.start <= iAbsoluteMinutes && oInterval.end > iAbsoluteMinutes;
+            });
+        });
+    },
     getTimePattern: function (sStyle, sCalendarType) {
         assert(sStyle == 'short' || sStyle == 'medium' || sStyle == 'long' || sStyle == 'full', 'sStyle must be short, medium, long or full');
         return this._get(getCLDRCalendarName(sCalendarType), 'timeFormats', sStyle);
@@ -125,6 +176,10 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         this._appendItems(aPatterns, aMissingTokens);
         return aPatterns[0];
     },
+    getTimezoneTranslations: function () {
+        this.mTimezoneTranslations = this.mTimezoneTranslations || _resolveTimezoneTranslationStructure(this._get('timezoneNames'));
+        return Object.assign({}, this.mTimezoneTranslations);
+    },
     getCustomDateTimePattern: function (sSkeleton, sCalendarType) {
         var oAvailableFormats = this._get(getCLDRCalendarName(sCalendarType), 'dateTimeFormats', 'availableFormats');
         return this._getFormatPattern(sSkeleton, oAvailableFormats, sCalendarType);
@@ -743,7 +798,7 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         return oMessageBundle.getText(sKey, iWeekNumber);
     },
     firstDayStartsFirstWeek: function () {
-        return this._get('weekData-algorithm') === 'FIRSTDAY_STARTS_FIRSTWEEK';
+        return this.oLocale.getLanguage() === 'en' && this.oLocale.getRegion() === 'US';
     },
     getPreferredCalendarType: function () {
         var sCalendarPreference = this._get('calendarPreference'), aCalendars = sCalendarPreference ? sCalendarPreference.split(' ') : [], sCalendarName, sType, i;
@@ -1171,9 +1226,29 @@ var M_SUPPORTED_LOCALES = function () {
     return result;
 }();
 var mLocaleDatas = {};
+function _resolveTimezoneTranslationStructure(oNode, sKey, oResult, aParentTranslations) {
+    aParentTranslations = aParentTranslations ? aParentTranslations.slice() : [];
+    oResult = oResult || {};
+    sKey = sKey || '';
+    Object.keys(oNode).forEach(function (sChildKey) {
+        var vChildNode = oNode[sChildKey];
+        if (typeof vChildNode === 'object') {
+            var aParentTranslationForChild = aParentTranslations.slice();
+            var sParent = vChildNode['_parent'];
+            if (sParent) {
+                aParentTranslationForChild.push(sParent);
+            }
+            _resolveTimezoneTranslationStructure(vChildNode, sKey + sChildKey + '/', oResult, aParentTranslationForChild);
+        } else if (typeof vChildNode === 'string' && sChildKey !== '_parent') {
+            var sParents = aParentTranslations.length ? aParentTranslations.join(', ') + ', ' : '';
+            oResult[sKey + sChildKey] = sParents + vChildNode;
+        }
+    });
+    return oResult;
+}
 function getCLDRCalendarName(sCalendarType) {
     if (!sCalendarType) {
-        sCalendarType = Core.getConfiguration().getCalendarType();
+        sCalendarType = Configuration.getCalendarType();
     }
     return 'ca-' + sCalendarType.toLowerCase();
 }
@@ -1248,7 +1323,7 @@ function getData(oLocale) {
 var CustomLocaleData = LocaleData.extend('sap.ui.core.CustomLocaleData', {
     constructor: function (oLocale) {
         LocaleData.apply(this, arguments);
-        this.mCustomData = Core.getConfiguration().getFormatSettings().getCustomLocaleData();
+        this.mCustomData = Configuration.getFormatSettings().getCustomLocaleData();
     },
     _get: function () {
         var aArguments = Array.prototype.slice.call(arguments), sCalendar, sKey;

package/dist/sap/ui/core/date/Buddhist.js

@@ -117,11 +117,5 @@ Buddhist.prototype.setUTCFullYear = function (iYear, iMonth, iDay) {
     }
     return this._setUTCBuddhist(oBuddhist);
 };
-Buddhist.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate());
-};
-Buddhist.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
-};
 _Calendars.set(CalendarType.Buddhist, Buddhist);
 export default Buddhist;

package/dist/sap/ui/core/date/CalendarUtils.js

@@ -0,0 +1,36 @@
+import CalendarWeekNumbering from './CalendarWeekNumbering.js';
+import Configuration from '../Configuration.js';
+import LocaleData from '../LocaleData.js';
+var mWeekNumberingConfiguration = {
+    ISO_8601: {
+        firstDayOfWeek: 1,
+        minimalDaysInFirstWeek: 4
+    },
+    MiddleEastern: {
+        firstDayOfWeek: 6,
+        minimalDaysInFirstWeek: 1
+    },
+    WesternTraditional: {
+        firstDayOfWeek: 0,
+        minimalDaysInFirstWeek: 1
+    }
+};
+var CalendarUtils = {
+    getWeekConfigurationValues: function (sCalendarWeekNumbering, oLocale) {
+        var oLocaleData;
+        if (mWeekNumberingConfiguration.hasOwnProperty(sCalendarWeekNumbering)) {
+            return mWeekNumberingConfiguration[sCalendarWeekNumbering];
+        }
+        sCalendarWeekNumbering = sCalendarWeekNumbering || CalendarWeekNumbering.Default;
+        if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
+            oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+            oLocaleData = LocaleData.getInstance(oLocale);
+            return {
+                firstDayOfWeek: oLocaleData.getFirstDayOfWeek(),
+                minimalDaysInFirstWeek: oLocaleData.getMinimalDaysInFirstWeek()
+            };
+        }
+        return undefined;
+    }
+};
+export default CalendarUtils;

package/dist/sap/ui/core/date/CalendarWeekNumbering.js

@@ -0,0 +1,7 @@
+var CalendarWeekNumbering = {
+  Default: "Default",
+  ISO_8601: "ISO_8601",
+  MiddleEastern: "MiddleEastern",
+  WesternTraditional: "WesternTraditional"
+};
+export default CalendarWeekNumbering;

package/dist/sap/ui/core/date/Islamic.js

@@ -1,8 +1,8 @@
-import Core from '../Core.js';
 import UniversalDate from './UniversalDate.js';
 import CalendarType from '../CalendarType.js';
 import Log from '../../../base/Log.js';
 import _Calendars from './_Calendars.js';
+import Configuration from '../Configuration.js';
 var Islamic = UniversalDate.extend('sap.ui.core.date.Islamic', {
     constructor: function () {
         var aArgs = arguments;
@@ -102,9 +102,9 @@ function toGregorianArguments(aArgs) {
 function initCustomizationMap() {
     var sDateFormat, oCustomizationJSON;
     oCustomizationMap = {};
-    sDateFormat = Core.getConfiguration().getFormatSettings().getLegacyDateFormat();
+    sDateFormat = Configuration.getFormatSettings().getLegacyDateFormat();
     sDateFormat = _isSupportedIslamicCalendarType(sDateFormat) ? sDateFormat : 'A';
-    oCustomizationJSON = Core.getConfiguration().getFormatSettings().getLegacyDateCalendarCustomizing();
+    oCustomizationJSON = Configuration.getFormatSettings().getLegacyDateCalendarCustomizing();
     oCustomizationJSON = oCustomizationJSON || [];
     if (!oCustomizationJSON.length) {
         Log.warning('No calendar customizations.');

package/dist/sap/ui/core/date/Japanese.js

@@ -152,11 +152,11 @@ Japanese.prototype.setUTCEra = function (iEra, iYear, iMonth, iDay) {
     }
     return this._setUTCJapanese(oJapanese);
 };
-Japanese.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate());
+Japanese.prototype.getWeek = function (oLocale, vCalendarWeekNumbering) {
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate(), oLocale, vCalendarWeekNumbering);
 };
-Japanese.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+Japanese.prototype.getUTCWeek = function (oLocale, vCalendarWeekNumbering) {
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
 _Calendars.set(CalendarType.Japanese, Japanese);
 export default Japanese;

package/dist/sap/ui/core/date/UniversalDate.js

@@ -1,7 +1,10 @@
-import Core from '../Core.js';
 import BaseObject from '../../base/Object.js';
+import Configuration from '../Configuration.js';
+import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
 import _Calendars from './_Calendars.js';
+import CalendarUtils from './CalendarUtils.js';
+import CalendarWeekNumbering from './CalendarWeekNumbering.js';
 var UniversalDate = BaseObject.extend('sap.ui.core.date.UniversalDate', {
     constructor: function () {
         var clDate = UniversalDate.getClass();
@@ -46,7 +49,7 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
         throw new Error('The given date object is invalid');
     }
     if (!sCalendarType) {
-        sCalendarType = Core.getConfiguration().getCalendarType();
+        sCalendarType = Configuration.getCalendarType();
     }
     clDate = UniversalDate.getClass(sCalendarType);
     oInstance = Object.create(clDate.prototype);
@@ -56,7 +59,7 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
 };
 UniversalDate.getClass = function (sCalendarType) {
     if (!sCalendarType) {
-        sCalendarType = Core.getConfiguration().getCalendarType();
+        sCalendarType = Configuration.getCalendarType();
     }
     return _Calendars.get(sCalendarType);
 };
@@ -119,18 +122,22 @@ UniversalDate.prototype.getUTCEra = function () {
 };
 UniversalDate.prototype.setUTCEra = function (iEra) {
 };
-UniversalDate.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate());
+UniversalDate.prototype.getWeek = function (oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate(), oLocale, vCalendarWeekNumbering);
 };
-UniversalDate.prototype.setWeek = function (oWeek) {
-    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+UniversalDate.prototype.setWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setFullYear(oDate.year, oDate.month, oDate.day);
 };
-UniversalDate.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+UniversalDate.prototype.getUTCWeek = function (oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
-UniversalDate.prototype.setUTCWeek = function (oWeek) {
-    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+UniversalDate.prototype.setUTCWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setUTCFullYear(oDate.year, oDate.month, oDate.day);
 };
 UniversalDate.prototype.getQuarter = function () {
@@ -164,15 +171,21 @@ UniversalDate.prototype.getTimezoneLong = function () {
     }
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
-UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
-    if (oLocaleData.firstDayStartsFirstWeek()) {
+UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var clDate = this.getClass(sCalendarType);
+    var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering);
+    var oDate = new clDate(clDate.UTC(iYear, iMonth, iDay));
+    var iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+    var bSplitWeek = isSplitWeek(vCalendarWeekNumbering, oLocale);
+    if (bSplitWeek) {
         iWeek = calculateWeeks(oFirstDay, oDate);
     } else {
         iLastYear = iYear - 1;
         iNextYear = iYear + 1;
-        oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear);
-        oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear);
+        oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear, oLocale, vCalendarWeekNumbering);
+        oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear, oLocale, vCalendarWeekNumbering);
         if (oDate >= oNextFirstDay) {
             iYear = iNextYear;
             iWeek = 0;
@@ -188,9 +201,14 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
         week: iWeek
     };
 };
-UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek), bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
-    if (bIsRegionUS && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
+UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var clDate = this.getClass(sCalendarType);
+    var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering);
+    var oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
+    var bSplitWeek = isSplitWeek(vCalendarWeekNumbering, oLocale);
+    if (bSplitWeek && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
         return {
             year: iYear,
             month: 0,
@@ -203,8 +221,41 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
         day: oDate.getUTCDate()
     };
 };
-function getFirstDayOfFirstWeek(clDate, iYear) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), iMinDays = oLocaleData.getMinimalDaysInFirstWeek(), iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek(), oFirstDay = new clDate(clDate.UTC(iYear, 0, 1)), iDayCount = 7;
+function isSplitWeek(vCalendarWeekNumbering, oLocale) {
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var oLocaleData = LocaleData.getInstance(oLocale);
+    return (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) || vCalendarWeekNumbering === CalendarWeekNumbering.Default) && oLocaleData.firstDayStartsFirstWeek();
+}
+function checkWeekConfig(vCalendarWeekNumbering) {
+    if (typeof vCalendarWeekNumbering === 'object') {
+        if (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering)) {
+            throw new TypeError('Week config requires firstDayOfWeek and minimalDaysInFirstWeek to be set');
+        }
+    } else if (vCalendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(vCalendarWeekNumbering)) {
+        throw new TypeError('Illegal format option calendarWeekNumbering: \'' + vCalendarWeekNumbering + '\'');
+    }
+}
+function isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) {
+    if (typeof vCalendarWeekNumbering === 'object') {
+        return typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number';
+    } else if (vCalendarWeekNumbering) {
+        return true;
+    }
+    return false;
+}
+function resolveCalendarWeekConfiguration(vCalendarWeekNumbering, oLocale) {
+    if (typeof vCalendarWeekNumbering === 'object' && typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number') {
+        return vCalendarWeekNumbering;
+    }
+    return CalendarUtils.getWeekConfigurationValues(vCalendarWeekNumbering, oLocale);
+}
+function getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering) {
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var oWeekConfig = resolveCalendarWeekConfiguration(vCalendarWeekNumbering, oLocale);
+    var iMinDays = oWeekConfig.minimalDaysInFirstWeek;
+    var iFirstDayOfWeek = oWeekConfig.firstDayOfWeek;
+    var oFirstDay = new clDate(clDate.UTC(iYear, 0, 1));
+    var iDayCount = 7;
     if (isNaN(oFirstDay.getTime())) {
         throw new Error('Could not determine the first day of the week, because the date ' + 'object is invalid');
     }
@@ -247,7 +298,7 @@ UniversalDate.getEraStartDate = function (sCalendarType, iEra) {
     }
 };
 function getEras(sCalendarType) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), aEras = mEras[sCalendarType];
+    var oLocale = Configuration.getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), aEras = mEras[sCalendarType];
     if (!aEras) {
         var aEras = oLocaleData.getEraDates(sCalendarType);
         if (!aEras[0]) {