@ui5/webcomponents-localization 0.0.0-c41f1b293 → 0.0.0-c6c04c609

package/dist/sap/base/i18n/date/TimezoneUtils.js

@@ -0,0 +1,89 @@
+var TimezoneUtils = {};
+var sLocalTimezone = "";
+var aSupportedTimezoneIDs;
+var oIntlDateTimeFormatCache = {
+  _oCache: new Map(),
+  _iCacheLimit: 10,
+  get: function (sTimezone) {
+    var cacheEntry = this._oCache.get(sTimezone);
+    if (cacheEntry) {
+      return cacheEntry;
+    }
+    var oOptions = {
+      hourCycle: "h23",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      fractionalSecondDigits: 3,
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+      timeZone: sTimezone,
+      timeZoneName: "short",
+      era: "narrow",
+      weekday: "short"
+    };
+    var oInstance = new Intl.DateTimeFormat("en-US", oOptions);
+    if (this._oCache.size === this._iCacheLimit) {
+      this._oCache = new Map();
+    }
+    this._oCache.set(sTimezone, oInstance);
+    return oInstance;
+  }
+};
+TimezoneUtils.isValidTimezone = function (sTimezone) {
+  if (!sTimezone) {
+    return false;
+  }
+  if (Intl.supportedValuesOf) {
+    try {
+      aSupportedTimezoneIDs = aSupportedTimezoneIDs || Intl.supportedValuesOf("timeZone");
+      if (aSupportedTimezoneIDs.includes(sTimezone)) {
+        return true;
+      }
+    } catch (oError) {
+      aSupportedTimezoneIDs = [];
+    }
+  }
+  try {
+    oIntlDateTimeFormatCache.get(sTimezone);
+    return true;
+  } catch (oError) {
+    return false;
+  }
+};
+TimezoneUtils.convertToTimezone = function (oDate, sTargetTimezone) {
+  var oFormatParts = this._getParts(oDate, sTargetTimezone);
+  return TimezoneUtils._getDateFromParts(oFormatParts);
+};
+TimezoneUtils._getParts = function (oDate, sTargetTimezone) {
+  var sKey, oPart, oDateParts = Object.create(null), oIntlDate = oIntlDateTimeFormatCache.get(sTargetTimezone), oParts = oIntlDate.formatToParts(new Date(oDate.getTime()));
+  for (sKey in oParts) {
+    oPart = oParts[sKey];
+    if (oPart.type !== "literal") {
+      oDateParts[oPart.type] = oPart.value;
+    }
+  }
+  return oDateParts;
+};
+TimezoneUtils._getDateFromParts = function (oParts) {
+  var oDate = new Date(0), iUTCYear = parseInt(oParts.year);
+  if (oParts.era === "B") {
+    iUTCYear = iUTCYear * -1 + 1;
+  }
+  oDate.setUTCFullYear(iUTCYear, parseInt(oParts.month) - 1, parseInt(oParts.day));
+  oDate.setUTCHours(parseInt(oParts.hour), parseInt(oParts.minute), parseInt(oParts.second), parseInt(oParts.fractionalSecond || 0));
+  return oDate;
+};
+TimezoneUtils.calculateOffset = function (oDate, sTimezoneSource) {
+  var oFirstGuess = this.convertToTimezone(oDate, sTimezoneSource), iInitialOffset = oDate.getTime() - oFirstGuess.getTime(), oDateSource = new Date(oDate.getTime() + iInitialOffset), oDateTarget = this.convertToTimezone(oDateSource, sTimezoneSource);
+  return (oDateSource.getTime() - oDateTarget.getTime()) / 1000;
+};
+TimezoneUtils.getLocalTimezone = function () {
+  if (sLocalTimezone) {
+    return sLocalTimezone;
+  }
+  sLocalTimezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return sLocalTimezone;
+};
+export default TimezoneUtils;

package/dist/sap/ui/base/Metadata.js

@@ -2,6 +2,9 @@ import ObjectPath from '../../base/util/ObjectPath.js';
 import assert from '../../base/assert.js';
 import Log from '../../base/Log.js';
 import uniqueSort from '../../base/util/array/uniqueSort.js';
+function isFunction(obj) {
+    return typeof obj === 'function';
+}
 var Metadata = function (sClassName, oClassInfo) {
     assert(typeof sClassName === 'string' && sClassName, 'Metadata: sClassName must be a non-empty string');
     assert(typeof oClassInfo === 'object', 'Metadata: oClassInfo must be empty or an object');
@@ -13,7 +16,7 @@ var Metadata = function (sClassName, oClassInfo) {
         oClassInfo.metadata.__version = 1;
     }
     oClassInfo.metadata.__version = oClassInfo.metadata.__version || 2;
-    if (typeof oClassInfo.constructor !== 'function') {
+    if (!isFunction(oClassInfo.constructor)) {
         throw Error('constructor for class ' + sClassName + ' must have been declared before creating metadata for it');
     }
     this._sClassName = sClassName;
@@ -27,9 +30,17 @@ Metadata.prototype.extend = function (oClassInfo) {
 Metadata.prototype.applySettings = function (oClassInfo) {
     var that = this, oStaticInfo = oClassInfo.metadata, oPrototype;
     if (oStaticInfo.baseType) {
-        var oParentClass = ObjectPath.get(oStaticInfo.baseType);
-        if (typeof oParentClass !== 'function') {
-            Log.fatal('base class \'' + oStaticInfo.baseType + '\' does not exist');
+        var oParentClass;
+        if (isFunction(oStaticInfo.baseType)) {
+            oParentClass = oStaticInfo.baseType;
+            if (!isFunction(oParentClass.getMetadata)) {
+                throw new TypeError('baseType must be a UI5 class with a static getMetadata function');
+            }
+        } else {
+            oParentClass = ObjectPath.get(oStaticInfo.baseType);
+            if (!isFunction(oParentClass)) {
+                Log.fatal('base class \'' + oStaticInfo.baseType + '\' does not exist');
+            }
         }
         if (oParentClass.getMetadata) {
             this._oParent = oParentClass.getMetadata();
@@ -167,12 +178,12 @@ Metadata.createClass = function (fnBaseClass, sClassName, oClassInfo, FNMetaImpl
         sClassName = fnBaseClass;
         fnBaseClass = null;
     }
-    assert(!fnBaseClass || typeof fnBaseClass === 'function');
+    assert(!fnBaseClass || isFunction(fnBaseClass));
     assert(typeof sClassName === 'string' && !!sClassName);
     assert(!oClassInfo || typeof oClassInfo === 'object');
-    assert(!FNMetaImpl || typeof FNMetaImpl === 'function');
+    assert(!FNMetaImpl || isFunction(FNMetaImpl));
     FNMetaImpl = FNMetaImpl || Metadata;
-    if (typeof FNMetaImpl.preprocessClassInfo === 'function') {
+    if (isFunction(FNMetaImpl.preprocessClassInfo)) {
         oClassInfo = FNMetaImpl.preprocessClassInfo(oClassInfo);
     }
     oClassInfo = oClassInfo || {};
@@ -181,7 +192,7 @@ Metadata.createClass = function (fnBaseClass, sClassName, oClassInfo, FNMetaImpl
         oClassInfo.constructor = undefined;
     }
     var fnClass = oClassInfo.constructor;
-    assert(!fnClass || typeof fnClass === 'function');
+    assert(!fnClass || isFunction(fnClass));
     if (fnBaseClass) {
         if (!fnClass) {
             if (oClassInfo.metadata.deprecated) {
@@ -197,7 +208,7 @@ Metadata.createClass = function (fnBaseClass, sClassName, oClassInfo, FNMetaImpl
         }
         fnClass.prototype = Object.create(fnBaseClass.prototype);
         fnClass.prototype.constructor = fnClass;
-        oClassInfo.metadata.baseType = fnBaseClass.getMetadata().getName();
+        oClassInfo.metadata.baseType = fnBaseClass;
     } else {
         fnClass = fnClass || function () {
         };

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

@@ -1,8 +1,2 @@
-var CalendarType = {
-  Gregorian: "Gregorian",
-  Islamic: "Islamic",
-  Japanese: "Japanese",
-  Persian: "Persian",
-  Buddhist: "Buddhist"
-};
-export default CalendarType;
+import CalendarType from '../../base/i18n/date/CalendarType.js';
+export default CalendarType;

package/dist/sap/ui/core/Configuration.d.ts

@@ -13,5 +13,6 @@ declare const Configuration: {
         getLegacyDateCalendarCustomizing: typeof import("@ui5/webcomponents-base/dist/features/LegacyDateFormats.js").default.getLegacyDateCalendarCustomizing;
     };
     getTimezone: () => string;
+    getCalendarWeekNumbering: () => string;
 };
 export default Configuration;

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

@@ -16,6 +16,8 @@ const Configuration = {
     getOriginInfo: emptyFn,
     getFormatSettings: () => FormatSettings,
     getTimezone: () => getConfigTimezone() || TimezoneUtil.getLocalTimezone(),
+    // Calculate calendar week numbering by active format locale
+    getCalendarWeekNumbering: () => "Default",
 };
 export default Configuration;
 //# sourceMappingURL=Configuration.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Configuration.js","sourceRoot":"","sources":["../../../../src/sap/ui/core/Configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACnG,OAAO,4BAA4B,MAAM,mEAAmE,CAAC;AAC7G,aAAa;AACb,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEzB;;GAEG;AACH,MAAM,aAAa,GAAG;IACrB,WAAW;IACX,eAAe;IACf,qBAAqB,EAAE,GAAG,EAAE,CAAC,4BAA4B,CAAC,2IAA2I,CAAC;IACtM,aAAa,EAAE,OAAO;IACtB,iBAAiB,EAAE,GAAG,EAAE,CAAC,cAAc;IACvC,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,IAAI,YAAY,CAAC,gBAAgB,EAAY;CACnF,CAAC;AAEF,eAAe,aAAa,CAAC","sourcesContent":["import { getLanguage } from \"@ui5/webcomponents-base/dist/config/Language.js\";\nimport { getCalendarType } from \"@ui5/webcomponents-base/dist/config/CalendarType.js\";\nimport { getTimezone as getConfigTimezone } from \"@ui5/webcomponents-base/dist/config/Timezone.js\";\nimport getDesigntimePropertyAsArray from \"@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js\";\n// @ts-ignore\nimport TimezoneUtil from \"./format/TimezoneUtil.js\";\nimport FormatSettings from \"./FormatSettings.js\";\n\nconst emptyFn = () => {};\n\n/**\n * OpenUI5 Configuration Shim\n */\nconst Configuration = {\n\tgetLanguage,\n\tgetCalendarType,\n\tgetSupportedLanguages: () => 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$\"),\n\tgetOriginInfo: emptyFn,\n\tgetFormatSettings: () => FormatSettings,\n\tgetTimezone: () => getConfigTimezone() || TimezoneUtil.getLocalTimezone() as string,\n};\n\nexport default Configuration;\n"]}
+{"version":3,"file":"Configuration.js","sourceRoot":"","sources":["../../../../src/sap/ui/core/Configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACnG,OAAO,4BAA4B,MAAM,mEAAmE,CAAC;AAC7G,aAAa;AACb,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEzB;;GAEG;AACH,MAAM,aAAa,GAAG;IACrB,WAAW;IACX,eAAe;IACf,qBAAqB,EAAE,GAAG,EAAE,CAAC,4BAA4B,CAAC,2IAA2I,CAAC;IACtM,aAAa,EAAE,OAAO;IACtB,iBAAiB,EAAE,GAAG,EAAE,CAAC,cAAc;IACvC,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,IAAI,YAAY,CAAC,gBAAgB,EAAY;IACnF,4DAA4D;IAC5D,wBAAwB,EAAE,GAAG,EAAE,CAAC,SAAS;CACzC,CAAC;AAEF,eAAe,aAAa,CAAC","sourcesContent":["import { getLanguage } from \"@ui5/webcomponents-base/dist/config/Language.js\";\nimport { getCalendarType } from \"@ui5/webcomponents-base/dist/config/CalendarType.js\";\nimport { getTimezone as getConfigTimezone } from \"@ui5/webcomponents-base/dist/config/Timezone.js\";\nimport getDesigntimePropertyAsArray from \"@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js\";\n// @ts-ignore\nimport TimezoneUtil from \"./format/TimezoneUtil.js\";\nimport FormatSettings from \"./FormatSettings.js\";\n\nconst emptyFn = () => {};\n\n/**\n * OpenUI5 Configuration Shim\n */\nconst Configuration = {\n\tgetLanguage,\n\tgetCalendarType,\n\tgetSupportedLanguages: () => 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$\"),\n\tgetOriginInfo: emptyFn,\n\tgetFormatSettings: () => FormatSettings,\n\tgetTimezone: () => getConfigTimezone() || TimezoneUtil.getLocalTimezone() as string,\n\t// Calculate calendar week numbering by active format locale\n\tgetCalendarWeekNumbering: () => \"Default\",\n};\n\nexport default Configuration;\n"]}

package/dist/sap/ui/core/Core.d.ts

@@ -14,6 +14,7 @@ declare const Core: {
             getLegacyDateCalendarCustomizing: typeof import("@ui5/webcomponents-base/dist/features/LegacyDateFormats.js").default.getLegacyDateCalendarCustomizing;
         };
         getTimezone: () => string;
+        getCalendarWeekNumbering: () => string;
     };
     getLibraryResourceBundle: void;
     getFormatSettings: () => {

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

@@ -1,159 +1,62 @@
-import BaseObject from '../base/Object.js';
 import assert from '../../base/assert.js';
-import CalendarType from './CalendarType.js';
-var rLocale = /^((?:[A-Z]{2,3}(?:-[A-Z]{3}){0,3})|[A-Z]{4}|[A-Z]{5,8})(?:-([A-Z]{4}))?(?:-([A-Z]{2}|[0-9]{3}))?((?:-[0-9A-Z]{5,8}|-[0-9][0-9A-Z]{3})*)((?:-[0-9A-WYZ](?:-[0-9A-Z]{2,8})+)*)(?:-(X(?:-[0-9A-Z]{1,8})+))?$/i;
+import BaseObject from '../base/Object.js';
+import Localization from '../../base/i18n/Localization.js';
+import LanguageTag from '../../base/i18n/LanguageTag.js';
 var Locale = BaseObject.extend('sap.ui.core.Locale', {
-    constructor: function (sLocaleId) {
+    constructor: function (vLocale) {
         BaseObject.apply(this);
-        var aResult = rLocale.exec(sLocaleId.replace(/_/g, '-'));
-        if (aResult === null) {
-            throw new TypeError('The given language \'' + sLocaleId + '\' does not adhere to BCP-47.');
-        }
-        this.sLocaleId = sLocaleId;
-        this.sLanguage = aResult[1] || null;
-        this.sScript = aResult[2] || null;
-        this.sRegion = aResult[3] || null;
-        this.sVariant = aResult[4] && aResult[4].slice(1) || null;
-        this.sExtension = aResult[5] && aResult[5].slice(1) || null;
-        this.sPrivateUse = aResult[6] || null;
-        if (this.sLanguage) {
-            this.sLanguage = this.sLanguage.toLowerCase();
-        }
-        if (this.sScript) {
-            this.sScript = this.sScript.toLowerCase().replace(/^[a-z]/, function ($) {
-                return $.toUpperCase();
-            });
-        }
-        if (this.sRegion) {
-            this.sRegion = this.sRegion.toUpperCase();
+        if (vLocale instanceof LanguageTag) {
+            this.oLanguageTag = vLocale;
+            this.sLocaleId = this.oLanguageTag.toString();
+        } else {
+            this.oLanguageTag = new LanguageTag(vLocale);
+            this.sLocaleId = vLocale;
         }
+        Object.assign(this, this.oLanguageTag);
+        this.sLanguage = this.language;
     },
     getLanguage: function () {
-        return this.sLanguage;
+        return this.language;
     },
     getScript: function () {
-        return this.sScript;
+        return this.script;
     },
     getRegion: function () {
-        return this.sRegion;
+        return this.region;
     },
     getVariant: function () {
-        return this.sVariant;
+        return this.variant;
     },
     getVariantSubtags: function () {
-        return this.sVariant ? this.sVariant.split('-') : [];
+        return this.variantSubtags;
     },
     getExtension: function () {
-        return this.sExtension;
+        return this.extension;
     },
     getExtensionSubtags: function () {
-        return this.sExtension ? this.sExtension.slice(2).split('-') : [];
+        return this.extensionSubtags;
     },
     getPrivateUse: function () {
-        return this.sPrivateUse;
+        return this.privateUse;
     },
     getPrivateUseSubtags: function () {
-        return this.sPrivateUse ? this.sPrivateUse.slice(2).split('-') : [];
+        return this.privateUseSubtags;
     },
     hasPrivateUseSubtag: function (sSubtag) {
         assert(sSubtag && sSubtag.match(/^[0-9A-Z]{1,8}$/i), 'subtag must be a valid BCP47 private use tag');
-        return this.getPrivateUseSubtags().indexOf(sSubtag) >= 0;
+        return this.privateUseSubtags.indexOf(sSubtag) >= 0;
     },
     toString: function () {
-        return join(this.sLanguage, this.sScript, this.sRegion, this.sVariant, this.sExtension, this.sPrivateUse);
-    },
-    toLanguageTag: function () {
-        var sLanguage = this.getModernLanguage();
-        var sScript = this.sScript;
-        if (sLanguage === 'sr' && sScript === 'Latn') {
-            sLanguage = 'sh';
-            sScript = null;
-        }
-        return join(sLanguage, sScript, this.sRegion, this.sVariant, this.sExtension, this.sPrivateUse);
-    },
-    getModernLanguage: function () {
-        return M_ISO639_OLD_TO_NEW[this.sLanguage] || this.sLanguage;
+        return this.oLanguageTag.toString();
     },
     getSAPLogonLanguage: function () {
-        return this._getSAPLogonLanguage();
-    },
-    _getSAPLogonLanguage: function () {
-        var sLanguage = this.sLanguage || '';
-        if (sLanguage.indexOf('-') >= 0) {
-            sLanguage = sLanguage.slice(0, sLanguage.indexOf('-'));
-        }
-        sLanguage = M_ISO639_OLD_TO_NEW[sLanguage] || sLanguage;
-        if (sLanguage === 'zh' && !this.sScript && this.sRegion === 'TW') {
-            return 'ZF';
-        }
-        return M_LOCALE_TO_ABAP_LANGUAGE[join(sLanguage, this.sScript)] || M_LOCALE_TO_ABAP_LANGUAGE[join(sLanguage, this.sRegion)] || M_LOCALE_TO_ABAP_LANGUAGE[getPseudoLanguageTag(this.sPrivateUse)] || sLanguage.toUpperCase();
-    },
-    getPreferredCalendarType: function () {
-        return Locale._mPreferredCalendar[this.getLanguage() + '-' + this.getRegion()] || Locale._mPreferredCalendar[this.getLanguage()] || Locale._mPreferredCalendar['default'];
+        return Localization._getSAPLogonLanguage(this);
     }
 });
-function getPseudoLanguageTag(sPrivateUse) {
-    if (sPrivateUse) {
-        var m = /-(saptrc|sappsd|saprigi)(?:-|$)/i.exec(sPrivateUse);
-        return m && 'en-US-x-' + m[1].toLowerCase();
-    }
-}
-var M_ISO639_OLD_TO_NEW = {
-    'iw': 'he',
-    'ji': 'yi'
-};
-var M_ABAP_LANGUAGE_TO_LOCALE = {
-    'ZH': 'zh-Hans',
-    'ZF': 'zh-Hant',
-    'SH': 'sr-Latn',
-    '6N': 'en-GB',
-    '1P': 'pt-PT',
-    '1X': 'es-MX',
-    '3F': 'fr-CA',
-    '1Q': 'en-US-x-saptrc',
-    '2Q': 'en-US-x-sappsd',
-    '3Q': 'en-US-x-saprigi'
-};
-var M_LOCALE_TO_ABAP_LANGUAGE = inverse(M_ABAP_LANGUAGE_TO_LOCALE);
-function getDesigntimePropertyAsArray(sValue) {
-    var m = /\$([-a-z0-9A-Z._]+)(?::([^$]*))?\$/.exec(sValue);
-    return m && m[2] ? m[2].split(/,/) : null;
-}
-var A_RTL_LOCALES = getDesigntimePropertyAsArray('$cldr-rtl-locales:ar,fa,he$') || [];
-Locale._cldrLocales = getDesigntimePropertyAsArray('$cldr-locales:ar,ar_EG,ar_SA,bg,ca,cy,cs,da,de,de_AT,de_CH,el,el_CY,en,en_AU,en_GB,en_HK,en_IE,en_IN,en_NZ,en_PG,en_SG,en_ZA,es,es_AR,es_BO,es_CL,es_CO,es_MX,es_PE,es_UY,es_VE,et,fa,fi,fr,fr_BE,fr_CA,fr_CH,fr_LU,he,hi,hr,hu,id,it,it_CH,ja,kk,ko,lt,lv,ms,nb,nl,nl_BE,pl,pt,pt_PT,ro,ru,ru_UA,sk,sl,sr,sr_Latn,sv,th,tr,uk,vi,zh_CN,zh_HK,zh_SG,zh_TW$');
-Locale._mPreferredCalendar = {
-    'ar-SA': CalendarType.Islamic,
-    'fa': CalendarType.Persian,
-    'th': CalendarType.Buddhist,
-    'default': CalendarType.Gregorian
-};
-Locale._coreI18nLocales = getDesigntimePropertyAsArray('$core-i18n-locales:,ar,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,fi,fr,hi,hr,hu,it,iw,ja,kk,ko,lt,lv,ms,nl,no,pl,pt,ro,ru,sh,sk,sl,sv,th,tr,uk,vi,zh_CN,zh_TW$');
-Locale._impliesRTL = function (vLanguage) {
-    var oLocale = vLanguage instanceof Locale ? vLanguage : new Locale(vLanguage);
-    var sLanguage = oLocale.getLanguage() || '';
-    sLanguage = sLanguage && M_ISO639_OLD_TO_NEW[sLanguage] || sLanguage;
-    var sRegion = oLocale.getRegion() || '';
-    if (sRegion && A_RTL_LOCALES.indexOf(sLanguage + '_' + sRegion) >= 0) {
-        return true;
-    }
-    return A_RTL_LOCALES.indexOf(sLanguage) >= 0;
-};
-Locale.fromSAPLogonLanguage = function (sSAPLogonLanguage) {
-    if (sSAPLogonLanguage && typeof sSAPLogonLanguage === 'string') {
-        sSAPLogonLanguage = M_ABAP_LANGUAGE_TO_LOCALE[sSAPLogonLanguage.toUpperCase()] || sSAPLogonLanguage;
-        try {
-            return new Locale(sSAPLogonLanguage);
-        } catch (e) {
-        }
+Locale._getCoreLocale = function (oLocale) {
+    if (oLocale instanceof LanguageTag) {
+        oLocale = new Locale(oLocale);
     }
+    return oLocale;
 };
-function join() {
-    return Array.prototype.filter.call(arguments, Boolean).join('-');
-}
-function inverse(obj) {
-    return Object.keys(obj).reduce(function (inv, key) {
-        inv[obj[key]] = key;
-        return inv;
-    }, {});
-}
 export default Locale;

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

@@ -1,12 +1,14 @@
 import Core from './Core.js';
-import extend from '../../base/util/extend.js';
-import BaseObject from '../base/Object.js';
 import CalendarType from './CalendarType.js';
 import Locale from './Locale.js';
 import assert from '../../base/assert.js';
+import Localization from '../../base/i18n/Localization.js';
+import extend from '../../base/util/extend.js';
 import LoaderExtensions from '../../base/util/LoaderExtensions.js';
+import BaseObject from '../base/Object.js';
 import Configuration from './Configuration.js';
-var rEIgnoreCase = /e/i, mLegacyUnit2CurrentUnit = {
+import CalendarWeekNumbering from './date/CalendarWeekNumbering.js';
+var rCIgnoreCase = /c/i, rEIgnoreCase = /e/i, mLegacyUnit2CurrentUnit = {
         'acceleration-meter-per-second-squared': 'acceleration-meter-per-square-second',
         'concentr-milligram-per-deciliter': 'concentr-milligram-ofglucose-per-deciliter',
         'concentr-part-per-million': 'concentr-permillion',
@@ -18,9 +20,9 @@ var rEIgnoreCase = /e/i, mLegacyUnit2CurrentUnit = {
     }, rNumberInScientificNotation = /^([+-]?)((\d+)(?:\.(\d+))?)[eE]([+-]?\d+)$/, rTrailingZeroes = /0+$/;
 var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
     constructor: function (oLocale) {
-        this.oLocale = oLocale;
+        this.oLocale = Locale._getCoreLocale(oLocale);
         BaseObject.apply(this);
-        var oDataLoaded = getData(oLocale);
+        var oDataLoaded = getData(this.oLocale);
         this.mData = oDataLoaded.mData;
         this.sCLDRLocaleId = oDataLoaded.sCLDRLocaleId;
     },
@@ -46,7 +48,7 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
     getCurrentLanguageName: function () {
         var oLanguages = this.getLanguages();
         var sCurrentLanguage;
-        var sLanguage = this.oLocale.getModernLanguage();
+        var sLanguage = Localization.getModernLanguage(this.oLocale.language);
         var sScript = this.oLocale.getScript();
         if (sLanguage === 'sr' && sScript === 'Latn') {
             sLanguage = 'sh';
@@ -837,11 +839,8 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         aCategories.push('other');
         return aCategories;
     },
-    getPluralCategory: function (sNumber) {
-        var oPlurals = this._get('plurals');
-        if (typeof sNumber === 'number') {
-            sNumber = sNumber.toString();
-        }
+    getPluralCategory: function (vNumber) {
+        var sNumber = typeof vNumber === 'number' ? vNumber.toString() : vNumber, oPlurals = this._get('plurals');
         if (!this._pluralTest) {
             this._pluralTest = {};
         }
@@ -987,7 +986,9 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
             throw new Error('Not completely parsed');
         }
         return function (sValue) {
-            var iDotPos, iExponent, sFraction, sFractionNoZeros, sInteger, o, iExponentPos = sValue.search(rEIgnoreCase);
+            var iDotPos, iExponent, iExponentPos, sFraction, sFractionNoZeros, sInteger, o;
+            sValue = sValue.replace(rCIgnoreCase, 'e');
+            iExponentPos = sValue.search(rEIgnoreCase);
             iExponent = iExponentPos < 0 ? 0 : parseInt(sValue.slice(iExponentPos + 1));
             sValue = LocaleData.convertToDecimal(sValue);
             iDotPos = sValue.indexOf('.');
@@ -1266,12 +1267,13 @@ var mCLDRSymbols = {
         numericCeiling: 100
     }
 };
-var M_ISO639_OLD_TO_NEW = {
-    'iw': 'he',
-    'ji': 'yi'
-};
+function getDesigntimePropertyAsArray(sValue) {
+    var m = /\$([-a-z0-9A-Z._]+)(?::([^$]*))?\$/.exec(sValue);
+    return m && m[2] ? m[2].split(/,/) : null;
+}
+var _cldrLocales = getDesigntimePropertyAsArray('$cldr-locales:ar,ar_EG,ar_SA,bg,ca,cy,cs,da,de,de_AT,de_CH,el,el_CY,en,en_AU,en_GB,en_HK,en_IE,en_IN,en_NZ,en_PG,en_SG,en_ZA,es,es_AR,es_BO,es_CL,es_CO,es_MX,es_PE,es_UY,es_VE,et,fa,fi,fr,fr_BE,fr_CA,fr_CH,fr_LU,he,hi,hr,hu,id,it,it_CH,ja,kk,ko,lt,lv,ms,nb,nl,nl_BE,pl,pt,pt_PT,ro,ru,ru_UA,sk,sl,sr,sr_Latn,sv,th,tr,uk,vi,zh_CN,zh_HK,zh_SG,zh_TW$');
 var M_SUPPORTED_LOCALES = function () {
-    var LOCALES = Locale._cldrLocales, result = {}, i;
+    var LOCALES = _cldrLocales, result = {}, i;
     if (LOCALES) {
         for (i = 0; i < LOCALES.length; i++) {
             result[LOCALES[i]] = true;
@@ -1340,7 +1342,7 @@ function getData(oLocale) {
         }
         return mLocaleDatas[sId];
     }
-    sLanguage = sLanguage && M_ISO639_OLD_TO_NEW[sLanguage] || sLanguage;
+    sLanguage = sLanguage && Localization.getModernLanguage(sLanguage) || sLanguage;
     if (sLanguage === 'no') {
         sLanguage = 'nb';
     }
@@ -1401,9 +1403,25 @@ var CustomLocaleData = LocaleData.extend('sap.ui.core.CustomLocaleData', {
         var mData = this._getDeep(this.mData, arguments);
         var mCustomData = this._getDeep(this.mCustomData, arguments);
         return extend({}, mData, mCustomData);
+    },
+    getFirstDayOfWeek: function () {
+        var sCalendarWeekNumbering = Configuration.getCalendarWeekNumbering();
+        if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
+            return LocaleData.prototype.getFirstDayOfWeek.call(this);
+        }
+        return CalendarWeekNumbering.getWeekConfigurationValues(sCalendarWeekNumbering).firstDayOfWeek;
+    },
+    getMinimalDaysInFirstWeek: function () {
+        var sCalendarWeekNumbering = Configuration.getCalendarWeekNumbering();
+        if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
+            return LocaleData.prototype.getMinimalDaysInFirstWeek.call(this);
+        }
+        return CalendarWeekNumbering.getWeekConfigurationValues(sCalendarWeekNumbering).minimalDaysInFirstWeek;
     }
 });
 LocaleData.getInstance = function (oLocale) {
+    oLocale = Locale._getCoreLocale(oLocale);
     return oLocale.hasPrivateUseSubtag('sapufmt') ? new CustomLocaleData(oLocale) : new LocaleData(oLocale);
 };
+LocaleData._cldrLocales = _cldrLocales;
 export default LocaleData;

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

@@ -1,27 +1,16 @@
 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];
+        var oLocaleData, oWeekConfigurationValues;
+        if (!sCalendarWeekNumbering) {
+            return CalendarUtils.getWeekConfigurationValues(Configuration.getCalendarWeekNumbering(), oLocale);
+        }
+        oWeekConfigurationValues = CalendarWeekNumbering.getWeekConfigurationValues(sCalendarWeekNumbering);
+        if (oWeekConfigurationValues) {
+            return oWeekConfigurationValues;
         }
-        sCalendarWeekNumbering = sCalendarWeekNumbering || CalendarWeekNumbering.Default;
         if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
             oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
             oLocaleData = LocaleData.getInstance(oLocale);

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

@@ -1,7 +1,2 @@
-var CalendarWeekNumbering = {
-  Default: "Default",
-  ISO_8601: "ISO_8601",
-  MiddleEastern: "MiddleEastern",
-  WesternTraditional: "WesternTraditional"
-};
-export default CalendarWeekNumbering;
+import CalendarWeekNumbering from '../../../base/i18n/date/CalendarWeekNumbering.js';
+export default CalendarWeekNumbering;

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

@@ -124,20 +124,16 @@ UniversalDate.prototype.getUTCEra = function () {
 UniversalDate.prototype.setUTCEra = function (iEra) {
 };
 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, 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 (oLocale, vCalendarWeekNumbering) {
-    checkWeekConfig(vCalendarWeekNumbering);
     return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
 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);
 };
@@ -173,6 +169,7 @@ UniversalDate.prototype.getTimezoneLong = function () {
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
 UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLocale, vCalendarWeekNumbering) {
+    vCalendarWeekNumbering = vCalendarWeekNumbering || Configuration.getCalendarWeekNumbering();
     checkWeekConfig(vCalendarWeekNumbering);
     oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var clDate = this.getClass(sCalendarType);
@@ -203,6 +200,7 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLoc
     };
 };
 UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocale, vCalendarWeekNumbering) {
+    vCalendarWeekNumbering = vCalendarWeekNumbering || Configuration.getCalendarWeekNumbering();
     checkWeekConfig(vCalendarWeekNumbering);
     oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var clDate = this.getClass(sCalendarType);
@@ -223,27 +221,18 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocal
     };
 };
 function isSplitWeek(vCalendarWeekNumbering, oLocale) {
-    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var oLocaleData = LocaleData.getInstance(oLocale);
-    return (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) || vCalendarWeekNumbering === CalendarWeekNumbering.Default) && oLocaleData.firstDayStartsFirstWeek();
+    return (vCalendarWeekNumbering === CalendarWeekNumbering.Default || vCalendarWeekNumbering === CalendarWeekNumbering.WesternTraditional) && oLocaleData.firstDayStartsFirstWeek();
 }
 function checkWeekConfig(vCalendarWeekNumbering) {
     if (typeof vCalendarWeekNumbering === 'object') {
-        if (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering)) {
+        if (typeof vCalendarWeekNumbering.firstDayOfWeek !== 'number' || typeof vCalendarWeekNumbering.minimalDaysInFirstWeek !== 'number') {
             throw new TypeError('Week config requires firstDayOfWeek and minimalDaysInFirstWeek to be set');
         }
-    } else if (vCalendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(vCalendarWeekNumbering)) {
+    } else if (!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;