@ui5/webcomponents-localization 1.3.1 → 1.6.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.6.0](https://github.com/SAP/ui5-webcomponents/compare/v1.5.0...v1.6.0) (2022-07-25)
+
+
+### Features
+
+* **ui5-calendar:** show months and years from both primary and secon… ([#5412](https://github.com/SAP/ui5-webcomponents/issues/5412)) ([d5dc7ec](https://github.com/SAP/ui5-webcomponents/commit/d5dc7ec))
+
+
+
+
+
+# [1.5.0](https://github.com/SAP/ui5-webcomponents/compare/v1.4.0...v1.5.0) (2022-07-03)
+
+**Note:** Version bump only for package @ui5/webcomponents-localization
+
+
+
+
+
+# [1.4.0](https://github.com/SAP/ui5-webcomponents/compare/v1.3.1...v1.4.0) (2022-05-25)
+
+**Note:** Version bump only for package @ui5/webcomponents-localization
+
+
+
+
+
 ## [1.3.1](https://github.com/SAP/ui5-webcomponents/compare/v1.3.0...v1.3.1) (2022-04-27)
 
 **Note:** Version bump only for package @ui5/webcomponents-localization

package/README.md

@@ -1,8 +1,7 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/master/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/main/docs/images/UI5_logo_wide.png)
 
 # UI5 Web Components - Localization
 
-[![Travis CI Build Status](https://travis-ci.org/SAP/ui5-webcomponents.svg?branch=master)](https://travis-ci.org/SAP/ui5-webcomponents)
 [![npm Package Version](https://badge.fury.io/js/%40ui5%2Fwebcomponents.svg)](https://www.npmjs.com/package/@ui5/webcomponents)
 
 Provides date/time and CLDR functionality for the purposes of building UI5 Web Components.
@@ -39,16 +38,16 @@ In order to be able to use Buddhist, Islamic, Japanese, or Persian calendar with
 (by setting its `primaryCalendarType` property), you must import one or more of the modules above.
 
 ## Resources
-- [UI5 Web Components - README.md](https://github.com/SAP/ui5-webcomponents/blob/master/README.md)
+- [UI5 Web Components - README.md](https://github.com/SAP/ui5-webcomponents/blob/main/README.md)
 - [UI5 Web Components - Home Page](https://sap.github.io/ui5-webcomponents)
 - [UI5 Web Components - Playground and API Reference](https://sap.github.io/ui5-webcomponents/playground/)
 
 ## Support
-We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/master/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://join-ui5-slack.herokuapp.com/).
+We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://join-ui5-slack.herokuapp.com/).
 
 ## Contribute
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-webcomponents/blob/master/docs/6-contributing/02-conventions-and-guidelines.md).
+Please check our [Contribution Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/docs/6-contributing/02-conventions-and-guidelines.md).
 
 ## License
 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
-This file is licensed under the Apache Software License, Version 2.0 except as noted otherwise in the [LICENSE](https://github.com/SAP/ui5-webcomponents/blob/master/LICENSE.txt) file.
+This file is licensed under the Apache Software License, Version 2.0 except as noted otherwise in the [LICENSE](https://github.com/SAP/ui5-webcomponents/blob/main/LICENSE.txt) file.

package/dist/dates/CalendarDate.js

@@ -177,7 +177,13 @@ class CalendarDate {
 
 	static fromTimestamp(iTimestamp, sCalendarType) {
 		const oCalDate = new CalendarDate(0, 0, 1);
-		oCalDate._oUDate = UniversalDate.getInstance(new Date(iTimestamp), sCalendarType);
+		let oUDate;
+		try {
+			oUDate = UniversalDate.getInstance(new Date(iTimestamp), sCalendarType);
+		} catch (e) {
+			oUDate = new Date(NaN); // UniversalDate.getInstance may now throw an Exception - keep the old behavior
+		}
+		oCalDate._oUDate = oUDate;
 		return oCalDate;
 	}
 }

package/dist/dates/convertMonthNumbersToMonthNames.js

@@ -0,0 +1,33 @@
+import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
+import getCachedLocaleDataInstance from "../getCachedLocaleDataInstance.js";
+
+/**
+ * Convert month number to month name (text).
+ * If the numbers of the two months are the same you will get the name of the month,
+ * otherwise you will get the two names separated by a dash
+ *
+ * @param firstMonth CalendarDate Month
+ * @param lastMonth CalendarDate Month
+ * @param calendarType calendar type
+ * @returns {String}
+ */
+const convertMonthNumbersToMonthNames = (firstMonth, lastMonth, calendarType) => {
+	const localeData = getCachedLocaleDataInstance(getLocale());
+	const pattern = localeData.getIntervalPattern();
+	const secondaryMonthsNames = localeData.getMonthsStandAlone("abbreviated", calendarType);
+	const secondaryMonthsNamesWide = localeData.getMonthsStandAlone("wide", calendarType);
+
+	if (firstMonth === lastMonth) {
+		return {
+			text: localeData.getMonths("abbreviated", calendarType)[firstMonth],
+			textInfo: localeData.getMonths("wide", calendarType)[firstMonth],
+		};
+	}
+
+	return {
+		text: pattern.replace(/\{0\}/, secondaryMonthsNames[firstMonth]).replace(/\{1\}/, secondaryMonthsNames[lastMonth]),
+		textInfo: pattern.replace(/\{0\}/, secondaryMonthsNamesWide[firstMonth]).replace(/\{1\}/, secondaryMonthsNamesWide[lastMonth]),
+	};
+};
+
+export default convertMonthNumbersToMonthNames;

package/dist/dates/getDaysInMonth.js

@@ -0,0 +1,11 @@
+import CalendarDate from "./CalendarDate.js";
+
+const getDaysInMonth = date => {
+	const tempCalendarDate = new CalendarDate(date);
+	tempCalendarDate.setDate(1);
+	tempCalendarDate.setMonth(tempCalendarDate.getMonth() + 1);
+	tempCalendarDate.setDate(0);
+	return tempCalendarDate.getDate();
+};
+
+export default getDaysInMonth;

package/dist/dates/transformDateToSecondaryType.js

@@ -0,0 +1,20 @@
+import CalendarDate from "./CalendarDate.js";
+import getDaysInMonth from "./getDaysInMonth.js";
+
+const transformDateToSecondaryType = (primaryCalendarType, secondaryCalendarType, timeStamp, hasYearPicker) => {
+	let firstDate = CalendarDate.fromLocalJSDate(new Date(timeStamp * 1000), primaryCalendarType);
+	let lastDate = CalendarDate.fromLocalJSDate(new Date(timeStamp * 1000), primaryCalendarType);
+	firstDate.setDate(1);
+
+	if (hasYearPicker) {
+		firstDate.setMonth(0);
+		lastDate.setMonth(11);
+	}
+
+	lastDate.setDate(getDaysInMonth(lastDate));
+	firstDate = new CalendarDate(firstDate, secondaryCalendarType);
+	lastDate = new CalendarDate(lastDate, secondaryCalendarType);
+	return { firstDate, lastDate };
+};
+
+export default transformDateToSecondaryType;

package/dist/generated/assets/cldr/en_AU.json

@@ -4914,7 +4914,7 @@
 		"one": "i = 1 and v = 0"
 	},
 	"weekData-minDays": 1,
-	"weekData-firstDay": 0,
+	"weekData-firstDay": 1,
 	"weekData-weekendStart": 6,
 	"weekData-weekendEnd": 0,
 	"timeData": {

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

@@ -2,6 +2,7 @@ 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 = () => {};
 
@@ -24,6 +25,7 @@ const Configuration = {
 	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(),
 };
 
 /**

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

@@ -1,5 +1,6 @@
 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;
 var Locale = BaseObject.extend('sap.ui.core.Locale', {
     constructor: function (sLocaleId) {
@@ -83,6 +84,9 @@ var Locale = BaseObject.extend('sap.ui.core.Locale', {
             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'];
     }
 });
 function getPseudoLanguageTag(sPrivateUse) {
@@ -114,6 +118,12 @@ function getDesigntimePropertyAsArray(sValue) {
 }
 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);

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

@@ -9,7 +9,9 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
     constructor: function (oLocale) {
         this.oLocale = oLocale;
         BaseObject.apply(this);
-        this.mData = getData(oLocale);
+        var oDataLoaded = getData(oLocale);
+        this.mData = oDataLoaded.mData;
+        this.sCLDRLocaleId = oDataLoaded.sCLDRLocaleId;
     },
     _get: function () {
         return this._getDeep(this.mData, arguments);
@@ -109,6 +111,20 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         var sDateTimePattern = this.getDateTimePattern(sDateStyle, sCalendarType), sDatePattern = this.getDatePattern(sDateStyle, sCalendarType), sTimePattern = this.getTimePattern(sTimeStyle, sCalendarType);
         return sDateTimePattern.replace('{0}', sTimePattern).replace('{1}', sDatePattern);
     },
+    getCombinedDateTimeWithTimezonePattern: function (sDateStyle, sTimeStyle, sCalendarType) {
+        return this.applyTimezonePattern(this.getCombinedDateTimePattern(sDateStyle, sTimeStyle, sCalendarType));
+    },
+    applyTimezonePattern: function (sPattern) {
+        var aPatterns = [sPattern];
+        var aMissingTokens = [{
+                group: 'Timezone',
+                length: 2,
+                field: 'zone',
+                symbol: 'V'
+            }];
+        this._appendItems(aPatterns, aMissingTokens);
+        return aPatterns[0];
+    },
     getCustomDateTimePattern: function (sSkeleton, sCalendarType) {
         var oAvailableFormats = this._get(getCLDRCalendarName(sCalendarType), 'dateTimeFormats', 'availableFormats');
         return this._getFormatPattern(sSkeleton, oAvailableFormats, sCalendarType);
@@ -1210,14 +1226,24 @@ function getData(oLocale) {
         sLanguage = 'sr_Latn';
     }
     var sId = sLanguage + '_' + sRegion;
+    var sCLDRLocaleId = sId;
     if (sLanguage && sRegion) {
         mData = getOrLoad(sId);
     }
     if (!mData && sLanguage) {
         mData = getOrLoad(sLanguage);
+        sCLDRLocaleId = sLanguage;
+    }
+    if (!mData) {
+        mData = getOrLoad('en');
+        sCLDRLocaleId = 'en';
     }
-    mLocaleDatas[sId] = mData || getOrLoad('en');
-    return mLocaleDatas[sId];
+    mLocaleDatas[sId] = mData;
+    sCLDRLocaleId = sCLDRLocaleId.replace(/_/g, '-');
+    return {
+        mData: mData,
+        sCLDRLocaleId: sCLDRLocaleId
+    };
 }
 var CustomLocaleData = LocaleData.extend('sap.ui.core.CustomLocaleData', {
     constructor: function (oLocale) {

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

@@ -42,6 +42,9 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     } else if (!oDate) {
         oDate = new Date();
     }
+    if (isNaN(oDate.getTime())) {
+        throw new Error('The given date object is invalid');
+    }
     if (!sCalendarType) {
         sCalendarType = Core.getConfiguration().getCalendarType();
     }
@@ -202,6 +205,9 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
 };
 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;
+    if (isNaN(oFirstDay.getTime())) {
+        throw new Error('Could not determine the first day of the week, because the date ' + 'object is invalid');
+    }
     while (oFirstDay.getUTCDay() !== iFirstDayOfWeek) {
         oFirstDay.setUTCDate(oFirstDay.getUTCDate() - 1);
         iDayCount--;