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

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

@@ -1,40 +1,13 @@
-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";
-
-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(),
-};
-
+import FormatSettings from "./FormatSettings.js";
+import Configuration from "./Configuration.js";
+const emptyFn = () => { };
 /**
  * OpenUI5 Core shim
  */
 const Core = {
-	getConfiguration: () => Configuration,
-	getLibraryResourceBundle: emptyFn(),
-	getFormatSettings: () => FormatSettings,
+    getConfiguration: () => Configuration,
+    getLibraryResourceBundle: emptyFn(),
+    getFormatSettings: () => FormatSettings,
 };
-
 export default Core;
+//# sourceMappingURL=Core.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Core.js","sourceRoot":"","sources":["../../../../src/sap/ui/core/Core.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,MAAM,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEzB;;GAEG;AACH,MAAM,IAAI,GAAG;IACZ,gBAAgB,EAAE,GAAG,EAAE,CAAC,aAAa;IACrC,wBAAwB,EAAE,OAAO,EAAE;IACnC,iBAAiB,EAAE,GAAG,EAAE,CAAC,cAAc;CACvC,CAAC;AAEF,eAAe,IAAI,CAAC","sourcesContent":["import FormatSettings from \"./FormatSettings.js\";\nimport Configuration from \"./Configuration.js\";\n\nconst emptyFn = () => {};\n\n/**\n * OpenUI5 Core shim\n */\nconst Core = {\n\tgetConfiguration: () => Configuration,\n\tgetLibraryResourceBundle: emptyFn(),\n\tgetFormatSettings: () => FormatSettings,\n};\n\nexport default Core;\n"]}

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

@@ -0,0 +1,10 @@
+/**
+ * OpenUI5 FormatSettings shim
+ */
+declare const FormatSettings: {
+    getFormatLocale: (lang?: string | undefined) => import("@ui5/webcomponents-base/dist/locale/Locale").default;
+    getLegacyDateFormat: () => void;
+    getCustomLocaleData: () => void;
+    getLegacyDateCalendarCustomizing: typeof import("@ui5/webcomponents-base/dist/features/LegacyDateFormats").default.getLegacyDateCalendarCustomizing;
+};
+export default FormatSettings;

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"FormatSettings.js","sourceRoot":"","sources":["../../../../src/sap/ui/core/FormatSettings.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,kDAAkD,CAAC;AACzE,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AAEzG,MAAM,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEzB;;GAEG;AACH,MAAM,cAAc,GAAG;IACtB,eAAe,EAAE,SAAS;IAC1B,mBAAmB,EAAE,OAAO;IAC5B,mBAAmB,EAAE,OAAO;IAC5B,gCAAgC;CAChC,CAAC;AAEF,eAAe,cAAc,CAAC","sourcesContent":["import getLocale from \"@ui5/webcomponents-base/dist/locale/getLocale.js\";\nimport { getLegacyDateCalendarCustomizing } from \"@ui5/webcomponents-base/dist/config/FormatSettings.js\";\n\nconst emptyFn = () => {};\n\n/**\n * OpenUI5 FormatSettings shim\n */\nconst FormatSettings = {\n\tgetFormatLocale: getLocale,\n\tgetLegacyDateFormat: emptyFn,\n\tgetCustomLocaleData: emptyFn,\n\tgetLegacyDateCalendarCustomizing,\n};\n\nexport default FormatSettings;\n"]}

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

@@ -1,156 +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 () {
-        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,15 +1,28 @@
 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';
+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',
+        'consumption-liter-per-100kilometers': 'consumption-liter-per-100-kilometer',
+        'pressure-millimeter-of-mercury': 'pressure-millimeter-ofhg',
+        'pressure-pound-per-square-inch': 'pressure-pound-force-per-square-inch',
+        'pressure-inch-hg': 'pressure-inch-ofhg',
+        'torque-pound-foot': 'torque-pound-force-foot'
+    }, 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;
     },
@@ -35,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';
@@ -97,6 +110,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 +188,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);
@@ -587,11 +654,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                     oTimeEntry = oScale[sEntry];
                     iSign = sEntry.substr(18) === 'past' ? -1 : 1;
                     aPluralCategories.forEach(function (sKey) {
-                        aPatterns.push({
-                            scale: sScale,
-                            sign: iSign,
-                            pattern: oTimeEntry['relativeTimePattern-count-' + sKey]
-                        });
+                        var sPattern = oTimeEntry['relativeTimePattern-count-' + sKey];
+                        if (sPattern) {
+                            aPatterns.push({
+                                scale: sScale,
+                                sign: iSign,
+                                pattern: sPattern
+                            });
+                        }
                     });
                 }
             }
@@ -714,7 +784,11 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         return this.getUnitFormat(sUnit);
     },
     getUnitFormat: function (sUnit) {
-        return this._get('units', 'short', sUnit);
+        var oResult = this._get('units', 'short', sUnit);
+        if (!oResult && mLegacyUnit2CurrentUnit[sUnit]) {
+            oResult = this._get('units', 'short', mLegacyUnit2CurrentUnit[sUnit]);
+        }
+        return oResult;
     },
     getUnitFormats: function () {
         return this._getMerged('units', 'short');
@@ -743,10 +817,10 @@ 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;
+        var sCalendarName, sType, i, aCalendars = this._get('calendarPreference') || [];
         for (i = 0; i < aCalendars.length; i++) {
             sCalendarName = aCalendars[i].split('-')[0];
             for (sType in CalendarType) {
@@ -765,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 = {};
         }
@@ -779,14 +850,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                 fnTest = this._parsePluralRule(oPlurals[sCategory]);
                 this._pluralTest[sCategory] = fnTest;
             }
-            if (fnTest(sNumber)) {
+            if (fnTest(sNumber).bMatch) {
                 return sCategory;
             }
         }
         return 'other';
     },
     _parsePluralRule: function (sRule) {
-        var OP_OR = 'or', OP_AND = 'and', OP_MOD = '%', OP_EQ = '=', OP_NEQ = '!=', OPD_N = 'n', OPD_I = 'i', OPD_F = 'f', OPD_T = 't', OPD_V = 'v', OPD_W = 'w', RANGE = '..', SEP = ',';
+        var OP_OR = 'or', OP_AND = 'and', OP_MOD = '%', OP_EQ = '=', OP_NEQ = '!=', OPD_N = 'n', OPD_I = 'i', OPD_F = 'f', OPD_T = 't', OPD_V = 'v', OPD_W = 'w', OPD_C = 'c', OPD_E = 'e', RANGE = '..', SEP = ',';
         var i = 0, aTokens;
         aTokens = sRule.split(' ');
         function accept(sToken) {
@@ -880,6 +951,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                 return function (o) {
                     return o.w;
                 };
+            } else if (accept(OPD_C)) {
+                return function (o) {
+                    return o.c;
+                };
+            } else if (accept(OPD_E)) {
+                return function (o) {
+                    return o.c;
+                };
             } else {
                 throw new Error('Unknown operand: ' + consume());
             }
@@ -907,28 +986,59 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
             throw new Error('Not completely parsed');
         }
         return function (sValue) {
-            var iDotPos = sValue.indexOf('.'), sDecimal, sFraction, sFractionNoZeros, o;
+            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('.');
             if (iDotPos === -1) {
-                sDecimal = sValue;
+                sInteger = sValue;
                 sFraction = '';
                 sFractionNoZeros = '';
             } else {
-                sDecimal = sValue.substr(0, iDotPos);
-                sFraction = sValue.substr(iDotPos + 1);
-                sFractionNoZeros = sFraction.replace(/0+$/, '');
+                sInteger = sValue.slice(0, iDotPos);
+                sFraction = sValue.slice(iDotPos + 1);
+                sFractionNoZeros = sFraction.replace(rTrailingZeroes, '');
             }
             o = {
                 n: parseFloat(sValue),
-                i: parseInt(sDecimal),
+                i: parseInt(sInteger),
                 v: sFraction.length,
                 w: sFractionNoZeros.length,
-                f: parseInt(sFraction),
-                t: parseInt(sFractionNoZeros)
+                f: sFraction === '' ? 0 : parseInt(sFraction),
+                t: sFractionNoZeros === '' ? 0 : parseInt(sFractionNoZeros),
+                c: iExponent
+            };
+            return {
+                bMatch: fnOr(o),
+                oOperands: o
             };
-            return fnOr(o);
         };
     }
 });
+LocaleData.convertToDecimal = function (vValue) {
+    var iIntegerLength, iExponent, iFractionLength, bNegative, iNewIntegerLength, aResult, sValue = String(vValue);
+    if (!sValue.includes('e') && !sValue.includes('E')) {
+        return sValue;
+    }
+    aResult = sValue.match(rNumberInScientificNotation);
+    bNegative = aResult[1] === '-';
+    sValue = aResult[2].replace('.', '');
+    iIntegerLength = aResult[3] ? aResult[3].length : 0;
+    iFractionLength = aResult[4] ? aResult[4].length : 0;
+    iExponent = parseInt(aResult[5]);
+    iNewIntegerLength = iIntegerLength + iExponent;
+    if (iExponent > 0) {
+        sValue = iExponent < iFractionLength ? sValue.slice(0, iNewIntegerLength) + '.' + sValue.slice(iNewIntegerLength) : sValue = sValue.padEnd(iNewIntegerLength, '0');
+    } else {
+        sValue = -iExponent < iIntegerLength ? sValue = sValue.slice(0, iNewIntegerLength) + '.' + sValue.slice(iNewIntegerLength) : sValue = '0.' + sValue.padStart(iFractionLength - iExponent, '0');
+    }
+    if (bNegative) {
+        sValue = '-' + sValue;
+    }
+    return sValue;
+};
 var mCLDRSymbolGroups = {
     'Era': {
         field: 'era',
@@ -1157,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;
@@ -1171,9 +1282,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();
 }
@@ -1192,7 +1323,7 @@ function getData(oLocale) {
                     obj[name] = fallbackValue;
                 } else if (value === null) {
                     delete obj[name];
-                } else if (typeof value === 'object' && typeof fallbackValue === 'object') {
+                } else if (typeof value === 'object' && typeof fallbackValue === 'object' && !Array.isArray(value)) {
                     merge(value, fallbackValue);
                 }
             }
@@ -1211,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';
     }
@@ -1248,7 +1379,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;
@@ -1272,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/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;