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

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;

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

@@ -1,16 +1,17 @@
+import Log from '../../../base/Log.js';
+import formatMessage from '../../../base/strings/formatMessage.js';
+import deepEqual from '../../../base/util/deepEqual.js';
+import extend from '../../../base/util/extend.js';
 import CalendarType from '../CalendarType.js';
+import Configuration from '../Configuration.js';
+import Core from '../Core.js';
 import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
-import UI5Date from '../date/UI5Date.js';
-import UniversalDate from '../date/UniversalDate.js';
 import CalendarUtils from '../date/CalendarUtils.js';
 import CalendarWeekNumbering from '../date/CalendarWeekNumbering.js';
+import UI5Date from '../date/UI5Date.js';
+import UniversalDate from '../date/UniversalDate.js';
 import TimezoneUtil from './TimezoneUtil.js';
-import deepEqual from '../../../base/util/deepEqual.js';
-import formatMessage from '../../../base/strings/formatMessage.js';
-import Log from '../../../base/Log.js';
-import extend from '../../../base/util/extend.js';
-import Configuration from '../Configuration.js';
 var DateFormat = function () {
     throw new Error();
 };
@@ -232,21 +233,23 @@ DateFormat.getDateTimeInstance = function (oFormatOptions, oLocale) {
 };
 DateFormat.getDateTimeWithTimezoneInstance = function (oFormatOptions, oLocale) {
     if (oFormatOptions && !(oFormatOptions instanceof Locale)) {
-        oFormatOptions = Object.assign({}, oFormatOptions);
-        if (typeof oFormatOptions.showTimezone === 'string') {
-            var sShowTimezone = oFormatOptions.showTimezone;
-            if (oFormatOptions.showDate === undefined && oFormatOptions.showTime === undefined) {
-                if (sShowTimezone === 'Hide') {
-                    oFormatOptions.showTimezone = false;
-                } else if (sShowTimezone === 'Only') {
-                    oFormatOptions.showDate = false;
-                    oFormatOptions.showTime = false;
+        (function () {
+            oFormatOptions = Object.assign({}, oFormatOptions);
+            if (typeof oFormatOptions.showTimezone === 'string') {
+                var sShowTimezone = oFormatOptions.showTimezone;
+                if (oFormatOptions.showDate === undefined && oFormatOptions.showTime === undefined) {
+                    if (sShowTimezone === 'Hide') {
+                        oFormatOptions.showTimezone = false;
+                    } else if (sShowTimezone === 'Only') {
+                        oFormatOptions.showDate = false;
+                        oFormatOptions.showTime = false;
+                    }
                 }
+                oFormatOptions.showTimezone = sShowTimezone !== 'Hide';
             }
-            oFormatOptions.showTimezone = sShowTimezone !== 'Hide';
-        }
+        }());
         if (oFormatOptions.showDate === false && oFormatOptions.showTime === false && oFormatOptions.showTimezone === false) {
-            throw new TypeError('Invalid Configuration. One of the following format options must be true: showDate, showTime or showTimezone.');
+            throw new TypeError('Invalid Configuration. One of the following format options must be true: ' + 'showDate, showTime or showTimezone.');
         }
     }
     return this.createInstance(oFormatOptions, oLocale, DateFormat._getDateTimeWithTimezoneInfo(oFormatOptions || {}));
@@ -299,13 +302,16 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo, bIsFallbac
         }
     }
     if (oFormat.oFormatOptions.interval) {
+        var sSinglePattern, sDelimiter = oFormat.oFormatOptions.intervalDelimiter;
         if (oFormat.oFormatOptions.format) {
             oFormat.intervalPatterns = oFormat.oLocaleData.getCustomIntervalPattern(oFormat.oFormatOptions.format, null, oFormat.oFormatOptions.calendarType);
             if (typeof oFormat.intervalPatterns === 'string') {
                 oFormat.intervalPatterns = [oFormat.intervalPatterns];
             }
-            oFormat.intervalPatterns.push(oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType));
+            sSinglePattern = oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType);
+            oFormat.intervalPatterns.push(sSinglePattern);
         } else {
+            sSinglePattern = oFormat.oFormatOptions.pattern;
             oFormat.intervalPatterns = [
                 oFormat.oLocaleData.getCombinedIntervalPattern(oFormat.oFormatOptions.pattern, oFormat.oFormatOptions.calendarType),
                 oFormat.oFormatOptions.pattern
@@ -313,6 +319,12 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo, bIsFallbac
         }
         var sCommonConnectorPattern = createIntervalPatternWithNormalConnector(oFormat);
         oFormat.intervalPatterns.push(sCommonConnectorPattern);
+        if (sDelimiter) {
+            sDelimiter = sDelimiter.replace(/'/g, '\'\'');
+            sDelimiter = '\'' + sDelimiter + '\'';
+            oFormat.intervalPatterns.unshift(sSinglePattern + sDelimiter + sSinglePattern);
+        }
+        oFormat.intervalPatterns = Array.from(new Set(oFormat.intervalPatterns));
     }
     if (!bIsFallback) {
         aFallbackFormatOptions = oInfo.aFallbackFormatOptions;
@@ -1524,25 +1536,31 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
     }
     return sResult;
 };
+DateFormat.prototype._useCustomIntervalDelimiter = function (oDiffFields) {
+    var aTokens;
+    if (!this.oFormatOptions.intervalDelimiter) {
+        return false;
+    }
+    if (this.oFormatOptions.format) {
+        aTokens = this.oLocaleData._parseSkeletonFormat(this.oFormatOptions.format);
+        return aTokens.some(function (oToken) {
+            return oDiffFields[oToken.group];
+        });
+    }
+    return true;
+};
 DateFormat.prototype._formatInterval = function (aJSDates, bUTC) {
-    var sCalendarType = this.oFormatOptions.calendarType;
-    var oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType);
-    var oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType);
-    var oDate;
-    var oPart;
-    var sSymbol;
-    var aBuffer = [];
-    var sPattern;
-    var aFormatArray = [];
-    var oDiffField = this._getGreatestDiffField([
-        oFromDate,
-        oToDate
-    ]);
-    if (!oDiffField) {
+    var oDate, oPart, sPattern, sSymbol, aBuffer = [], sCalendarType = this.oFormatOptions.calendarType, aFormatArray = [], oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType), oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType), oDiffFields = this._getDiffFields([
+            oFromDate,
+            oToDate
+        ]);
+    if (!oDiffFields) {
         return this._format(aJSDates[0], bUTC);
     }
-    if (this.oFormatOptions.format) {
-        sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffField, sCalendarType);
+    if (this._useCustomIntervalDelimiter(oDiffFields)) {
+        sPattern = this.intervalPatterns[0];
+    } else if (this.oFormatOptions.format) {
+        sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffFields, sCalendarType);
     } else {
         sPattern = this.oLocaleData.getCombinedIntervalPattern(this.oFormatOptions.pattern, sCalendarType);
     }
@@ -1570,7 +1588,7 @@ var mFieldToGroup = {
     Minutes: 'Minute',
     Seconds: 'Second'
 };
-DateFormat.prototype._getGreatestDiffField = function (aDates) {
+DateFormat.prototype._getDiffFields = function (aDates) {
     var bDiffFound = false, mDiff = {};
     this.aIntervalCompareFields.forEach(function (sField) {
         var sGetterPrefix = 'getUTC', sMethodName = sGetterPrefix + sField, sFieldGroup = mFieldToGroup[sField], vFromValue = aDates[0][sMethodName].apply(aDates[0]), vToValue = aDates[1][sMethodName].apply(aDates[1]);
@@ -2247,4 +2265,28 @@ DateFormat.prototype.getAllowedCharacters = function (aFormatArray) {
     }
     return sAllowedCharacters;
 };
+DateFormat.prototype.getPlaceholderText = function () {
+    var oResourceBundle = Core.getLibraryResourceBundle();
+    return oResourceBundle.getText('date.placeholder', [this.format.apply(this, this.getSampleValue())]);
+};
+DateFormat.prototype.getSampleValue = function () {
+    var oDate, iFullYear = UI5Date.getInstance().getFullYear(), bUTC = this.oFormatOptions.UTC;
+    function getDate(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds) {
+        return bUTC ? UI5Date.getInstance(Date.UTC(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds)) : UI5Date.getInstance(iYear, iMonth, iDay, iHours, iMinutes, iSeconds, iMilliseconds);
+    }
+    oDate = getDate(iFullYear, 11, 31, 23, 59, 58, 123);
+    if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
+        return [
+            oDate,
+            Configuration.getTimezone()
+        ];
+    }
+    if (this.oFormatOptions.interval) {
+        return [[
+                getDate(iFullYear, 11, 22, 9, 12, 34, 567),
+                oDate
+            ]];
+    }
+    return [oDate];
+};
 export default DateFormat;

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

@@ -1,89 +1,2 @@
-var TimezoneUtil = {};
-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;
-  }
-};
-TimezoneUtil.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;
-  }
-};
-TimezoneUtil.convertToTimezone = function (oDate, sTargetTimezone) {
-  var oFormatParts = this._getParts(oDate, sTargetTimezone);
-  return TimezoneUtil._getDateFromParts(oFormatParts);
-};
-TimezoneUtil._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;
-};
-TimezoneUtil._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;
-};
-TimezoneUtil.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;
-};
-TimezoneUtil.getLocalTimezone = function () {
-  if (sLocalTimezone) {
-    return sLocalTimezone;
-  }
-  sLocalTimezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
-  return sLocalTimezone;
-};
-export default TimezoneUtil;
+import TimezoneUtils from '../../../base/i18n/date/TimezoneUtils.js';
+export default TimezoneUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "0.0.0-d010d8832",
+  "version": "0.0.0-d1315d658",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -28,14 +28,14 @@
     "prepublishOnly": "npm run clean && npm run build"
   },
   "devDependencies": {
-    "@openui5/sap.ui.core": "1.112.0",
-    "@ui5/webcomponents-tools": "0.0.0-d010d8832",
-    "chromedriver": "112.0.0",
+    "@openui5/sap.ui.core": "1.116.0",
+    "@ui5/webcomponents-tools": "0.0.0-d1315d658",
+    "chromedriver": "114.0.0",
     "mkdirp": "^1.0.4",
     "resolve": "^1.20.0"
   },
   "dependencies": {
-    "@types/openui5": "^1.112.0",
-    "@ui5/webcomponents-base": "0.0.0-d010d8832"
+    "@types/openui5": "^1.113.0",
+    "@ui5/webcomponents-base": "0.0.0-d1315d658"
   }
 }

package/used-modules.txt

@@ -2,6 +2,10 @@
 
 sap/base/Log.js
 sap/base/assert.js
+sap/base/i18n/LanguageTag.js
+sap/base/i18n/date/CalendarWeekNumbering.js
+sap/base/i18n/date/TimezoneUtils.js
+sap/base/i18n/date/CalendarType.js
 sap/base/strings/formatMessage.js
 sap/base/util/ObjectPath.js
 sap/base/util/array/uniqueSort.js