@osimatic/helpers-js 1.5.28 → 1.5.29

package/bank.js

@@ -15,7 +15,7 @@ class BankCard {
 		return cardNumber;
 	}
 
-	static formatExpirationDate(expirationDate, locale="fr-FR") {
+	static formatExpirationDate(expirationDate, locale='fr-FR') {
 		return SqlDateTime.getMonthName(expirationDate, locale)+' '+SqlDateTime.getYear(expirationDate);
 	}
 }

package/date_time.js

@@ -100,27 +100,27 @@ class DateTime {
 		return Math.trunc(jsDate.getTime()/1000);
 	}
 
-	static getDateDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateDigitalDisplay(jsDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTimeFormatter.getDateDigitalFormatter(locale, timeZone).format(jsDate);
 		//return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone}); 
 	}
 
-	static getDateTextDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTextDisplay(jsDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTimeFormatter.getDateTextFormatter(locale, timeZone).format(jsDate);
 		//return jsDate.toLocaleDateString(locale, {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone});  
 	}
 
-	static getTimeDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplay(jsDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTimeFormatter.getTimeFormatter(locale, timeZone).format(jsDate);
 		//return jsDate.toLocaleTimeString(locale, {hour: 'numeric', minute: 'numeric', timeZone: timeZone}); 
 	}
 
-	static getTimeDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDigitalDisplay(jsDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTimeFormatter.getTimeDigitalFormatter(locale, timeZone).format(jsDate);
 		//return jsDate.toLocaleTimeString(locale, {hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone}); 
 	}
 
-	static getTimeDisplayWithNbDays(jsDate, jsPreviousDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplayWithNbDays(jsDate, jsPreviousDate, locale='fr-FR', timeZone="Europe/Paris") {
 		let str = this.getTimeDisplay(jsDate, locale, timeZone);
 		if (jsPreviousDate !== 0 && jsPreviousDate != null) {
 			let nbDaysDiff = DatePeriod.getNbDayBetweenTwo(jsPreviousDate, jsDate, false);
@@ -131,7 +131,7 @@ class DateTime {
 		return str;
 	}
 
-	static getDateTimeDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTimeDigitalDisplay(jsDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTimeFormatter.getDateTimeFormatter(locale, timeZone).format(jsDate);
 		//return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone}); 
 	}
@@ -142,7 +142,7 @@ class DateTime {
 	static getMonth(jsDate) {
 		return jsDate.getUTCMonth()+1;
 	}
-	static getMonthName(jsDate, locale="fr-FR", isShort=false) {
+	static getMonthName(jsDate, locale='fr-FR', isShort=false) {
 		return jsDate.toLocaleDateString(locale, {month: (isShort?'short':'long')});
 	}
 	static getDay(jsDate) {
@@ -157,7 +157,7 @@ class DateTime {
 		return jsDate.getUTCDay();
 	}
 
-	static getDayName(jsDate, locale="fr-FR", isShort=false) {
+	static getDayName(jsDate, locale='fr-FR', isShort=false) {
 		return jsDate.toLocaleDateString(locale, {weekday: (isShort?'short':'long')});
 	}
 
@@ -165,13 +165,13 @@ class DateTime {
 		return new Date(Date.UTC(year, month, 0)).getDate();
 	}
 
-	static getMonthNameByMonth(month, locale="fr-FR", isShort=false) {
+	static getMonthNameByMonth(month, locale='fr-FR', isShort=false) {
 		let d = new Date();
 		d.setDate(1);
 		d.setMonth(month-1);
 		return this.getMonthName(d, locale, isShort);
 	}
-	static getDayNameByDayOfWeek(dayOfWeek, locale="fr-FR", isShort=false) {
+	static getDayNameByDayOfWeek(dayOfWeek, locale='fr-FR', isShort=false) {
 		let d = new Date();
 		// d.setDate(d.getDate() + (1 + 7 - d.getDay()) % 7);
 		d.setDate(d.getDate() + (dayOfWeek - d.getDay()) % 7);
@@ -375,20 +375,20 @@ class TimestampUnix {
 		return parseInt(today.getTime() / 1000);
 	}
 
-	static getDateDigitalDisplay(timestamp, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateDigitalDisplay(timestamp, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getDateDigitalDisplay(this.parse(timestamp), locale, timeZone);
 	}
-	static getDateTextDisplay(timestamp, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTextDisplay(timestamp, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getDateTextDisplay(this.parse(timestamp), locale, timeZone);
 	}
 
-	static getTimeDisplay(timestamp, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplay(timestamp, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDisplay(this.parse(timestamp), locale, timeZone);
 	}
-	static getTimeDisplayWithNbDays(timestamp, previousTimestamp, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplayWithNbDays(timestamp, previousTimestamp, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDisplayWithNbDays(this.parse(timestamp), this.parse(previousTimestamp), locale, timeZone);
 	}
-	static getTimeDigitalDisplay(timestamp, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDigitalDisplay(timestamp, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDigitalDisplay(this.parse(timestamp), locale, timeZone);
 	}
 
@@ -477,10 +477,10 @@ class SqlDate {
 		return DateTime.getSqlDate(new Date());
 	}
 
-	static getDateDigitalDisplay(sqlDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateDigitalDisplay(sqlDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return SqlDateTime.getDateDigitalDisplay(sqlDate+" 00:00:00", locale, timeZone);
 	}
-	static getDateTextDisplay(sqlDate, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTextDisplay(sqlDate, locale='fr-FR', timeZone="Europe/Paris") {
 		return SqlDateTime.getDateTextDisplay(sqlDate+" 00:00:00", locale, timeZone);
 	}
 
@@ -498,7 +498,7 @@ class SqlDate {
 	static getMonth(sqlDate) {
 		return SqlDateTime.getMonth(sqlDate+" 00:00:00");
 	}
-	static getMonthName(sqlDate, locale="fr-FR", isShort=false) {
+	static getMonthName(sqlDate, locale='fr-FR', isShort=false) {
 		return SqlDateTime.getMonthName(sqlDate+" 00:00:00", locale, isShort);
 	}
 	static getDay(sqlDate) {
@@ -539,13 +539,13 @@ class SqlTime {
 		return DateTime.getSqlTime(new Date());
 	}
 
-	static getTimeDisplay(sqlTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplay(sqlTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return SqlDateTime.getTimeDisplay('1970-01-01 '+sqlTime, locale, timeZone);
 	}
-	static getTimeDigitalDisplay(sqlTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDigitalDisplay(sqlTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return SqlDateTime.getTimeDigitalDisplay('1970-01-01 '+sqlTime, locale, timeZone);
 	}
-	static getTimeDisplayWithNbDays(sqlTime, previousSqlTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplayWithNbDays(sqlTime, previousSqlTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return SqlDateTime.getTimeDisplayWithNbDays('1970-01-01 '+sqlTime, '1970-01-01 '+previousSqlTime, locale, timeZone);
 	}
 
@@ -588,24 +588,24 @@ class SqlDateTime {
 		return new Date(Date.UTC(sqlDateTime.substring(0, 4), sqlDateTime.substring(5, 7)-1, sqlDateTime.substring(8, 10), sqlDateTime.substring(11, 13), sqlDateTime.substring(14, 16), sqlDateTime.substring(17, 19)));
 	}
 
-	static getDateDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateDigitalDisplay(sqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getDateDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
 	}
-	static getDateTextDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTextDisplay(sqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getDateTextDisplay(this.parse(sqlDateTime), locale, timeZone);
 	}
 
-	static getTimeDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplay(sqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDisplay(this.parse(sqlDateTime), locale, timeZone);
 	}
-	static getTimeDisplayWithNbDays(sqlDateTime, previousSqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDisplayWithNbDays(sqlDateTime, previousSqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDisplayWithNbDays(this.parse(sqlDateTime), this.parse(previousSqlDateTime), locale, timeZone);
 	}
-	static getTimeDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getTimeDigitalDisplay(sqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getTimeDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
 	}
 
-	static getDateTimeDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
+	static getDateTimeDigitalDisplay(sqlDateTime, locale='fr-FR', timeZone="Europe/Paris") {
 		return DateTime.getDateTimeDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
 	}
 
@@ -622,7 +622,7 @@ class SqlDateTime {
 	static getMonth(sqlDateTime) {
 		return DateTime.getMonth(this.parse(sqlDateTime));
 	}
-	static getMonthName(sqlDateTime, locale="fr-FR", isShort=false) {
+	static getMonthName(sqlDateTime, locale='fr-FR', isShort=false) {
 		return DateTime.getMonthName(this.parse(sqlDateTime), locale);
 	}
 	static getDay(sqlDateTime) {

package/location.js

@@ -20,7 +20,7 @@ class Country {
 		return [...countryCode.toUpperCase()].map(c => String.fromCodePoint(0x1F1E6 - 65 + c.charCodeAt(0))).join('');
 	}
 
-	static fillCountrySelect(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', showFlags=false) {
+	static fillSelect(select, defaultValue=null, showFlags=false, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', locale='fr-FR') {
 		select = toEl(select);
 		if (!select) {
 			return;
@@ -29,20 +29,44 @@ class Country {
 			if (addNoneValue) {
 				select.insertAdjacentHTML('beforeend', '<option value="">'+noneLabel+'</option>');
 			}
-			Object.entries(null != countriesList ? countriesList : Country.getCountries()).forEach(([countryCode, countryName]) => {
-				const flag = showFlags ? Country.getFlagEmoji(countryCode) + ' ' : '';
-				select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '">' + flag + countryName + '</option>');
+			const allCountries = Country.getCountries(locale);
+			const entries = countriesList != null
+				? countriesList.map(code => [code, allCountries[code] || code])
+				: Object.entries(allCountries);
+			entries.forEach(([countryCode, countryName]) => {
+				let attrs = '';
+				if (showFlags) {
+					if (typeof Country.flagsPath !== 'undefined') {
+						attrs = ' data-thumbnail="' + Country.getFlagPath(countryCode) + '"';
+					} else {
+						attrs = ' data-content="<span class=&quot;fi fi-' + countryCode.toLowerCase() + '&quot;></span> ' + countryName + '"';
+					}
+				}
+				select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '"' + attrs + '>' + countryName + '</option>');
 			});
 		}
 		if (null != defaultValue) {
 			select.value = defaultValue;
 		}
 	}
-	static getCountryName(countryCode, locale = 'en') {
+
+	static fillSelectWithFlags(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', locale='fr-FR') {
+		return Country.fillSelect(select, defaultValue, true, countriesList, addNoneValue, noneLabel, locale);
+	}
+
+	static getCountryName(countryCode, locale='fr-FR') {
 		const name = isoCountries.getName(countryCode, locale);
 		return name || countryCode;
 	}
 	static getCountries(locale = 'en') {
+		const names = isoCountries.getNames(locale);
+		if (!names || Object.keys(names).length === 0) {
+			try {
+				isoCountries.registerLocale(require('i18n-iso-countries/langs/' + locale + '.json'));
+			} catch (e) {
+				// locale not available
+			}
+		}
 		return isoCountries.getNames(locale);
 	}
 
@@ -58,10 +82,28 @@ class Country {
 		};
 	}
 
-	/** @deprecated **/
+	/** @deprecated Use getCountries instead **/
 	static getCountryList() {
 		return Country.getCountries();
 	}
+	/** @deprecated Use fillSelect instead **/
+	static fillCountrySelect(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -') {
+		select = toEl(select);
+		if (!select) {
+			return;
+		}
+		if (select.children.length === 0) {
+			if (addNoneValue) {
+				select.insertAdjacentHTML('beforeend', '<option value="">'+noneLabel+'</option>');
+			}
+			Object.entries(null != countriesList ? countriesList : Country.getCountries()).forEach(([countryCode, countryName]) => {
+				select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '">' + countryName + '</option>');
+			});
+		}
+		if (null != defaultValue) {
+			select.value = defaultValue;
+		}
+	}
 }
 
 class PostalAddress {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.5.28",
+  "version": "1.5.29",
   "main": "main.js",
   "scripts": {
     "test": "jest",
@@ -21,6 +21,7 @@
   },
   "peerDependencies": {
     "datatables.net": ">=2.0",
+    "flag-icons": ">=7.0",
     "intl-tel-input": ">=19.0",
     "leaflet": ">=1.9",
     "leaflet-draw": ">=1.0",

package/tests/location.test.js

@@ -109,13 +109,23 @@ describe('Country', () => {
 	});
 
 	describe('getCountries with locale', () => {
-		test('should support locale parameter', () => {
-			const isoCountries = require('i18n-iso-countries');
-			isoCountries.registerLocale(require('i18n-iso-countries/langs/fr.json'));
+		test('should auto-register and return names for an unregistered locale', () => {
 			const countriesFr = Country.getCountries('fr');
+			expect(typeof countriesFr).toBe('object');
 			expect(countriesFr.FR).toBe('France');
 			expect(typeof countriesFr.US).toBe('string');
 		});
+
+		test('should return names for de locale', () => {
+			const countriesDe = Country.getCountries('de');
+			expect(typeof countriesDe).toBe('object');
+			expect(countriesDe.DE).toBeTruthy();
+		});
+
+		test('should return empty object for unknown locale', () => {
+			const result = Country.getCountries('xx');
+			expect(typeof result).toBe('object');
+		});
 	});
 });