Improve date formatting

Author: m-mohr

I18N.js

@@ -9,6 +9,12 @@ const Defaults = {
 		year: 'numeric'
 	},
 	dateTimeFormatterOptions: {
+		day: 'numeric',
+		month: 'numeric',
+		year: 'numeric',
+		hour: 'numeric',
+		minute: 'numeric',
+		second: 'numeric',
 		timeZone: "UTC",
 		timeZoneName: "short"
 	}
@@ -23,19 +29,23 @@ const I18N = {
 	numberFormatter: new Intl.NumberFormat(),
 	translate: null, // function(value: string, vars: array|object = null) : string
 
+	getDefaults() {
+		return Defaults;
+	},
+
 	setLocales(locales, dateFormatterOptions = {}, dateTimeFormatterOptions = {}, numberFormatterOptions = {}, collatorOptions = {}) {
 		this.locales = locales;
 
-		collatorOptions = Object.assign({}, this.collatorOptions, collatorOptions);
+		collatorOptions = Object.assign({}, Defaults.collatorOptions, collatorOptions);
 		this.collator = new Intl.Collator(locales, collatorOptions);
 
-		dateFormatterOptions = Object.assign({}, this.dateFormatterOptions, dateFormatterOptions);
+		dateFormatterOptions = Object.assign({}, Defaults.dateFormatterOptions, dateFormatterOptions);
 		this.dateFormatter = new Intl.DateTimeFormat(locales, dateFormatterOptions);
 
-		dateTimeFormatterOptions = Object.assign({}, this.dateTimeFormatterOptions, dateTimeFormatterOptions);
+		dateTimeFormatterOptions = Object.assign({}, Defaults.dateTimeFormatterOptions, dateTimeFormatterOptions);
 		this.dateTimeFormatter = new Intl.DateTimeFormat(locales, dateTimeFormatterOptions);
 
-		numberFormatterOptions = Object.assign({}, this.numberFormatterOptions, numberFormatterOptions);
+		numberFormatterOptions = Object.assign({}, Defaults.numberFormatterOptions, numberFormatterOptions);
 		this.numberFormatter = new Intl.NumberFormat(locales, numberFormatterOptions);
 	},
 

formatters.js

@@ -374,23 +374,36 @@ const Formatters = {
 		}
 	},
 
-	formatTemporalExtent(value, field, spec = {}) {
-		let formatter = spec.shorten ? Formatters.formatDate : Formatters.formatTimestamp;
-		if (!Array.isArray(value) || value.length < 2 || (typeof value[0] !== 'string' && typeof value[1] !== 'string')) {
+	formatTemporalExtent(value, field, spec = {}) {	
+		if (!Array.isArray(value) || value.length !== 2) {
 			return DataTypes.null();
 		}
-		else if (typeof value[0] !== 'string') {
-			return _.t("Until {0}", [formatter(value[1])]);
-		}
-		else if (typeof value[1] !== 'string') {
-			return _.t("{0} until present", [formatter(value[0])]);
-		}
-		else if (value[0] === value[1]) {
-			return Formatters.formatTimestamp(value[0]);
-		}
-		else {
-			return value.map(date => formatter(date)).join(' - ');
-		}
+
+		value = value.map(d => {
+			try {
+				return d ? new Date(d) : null;
+			} catch(e) {
+				return null;
+			}
+		});
+
+		try {
+			const [start, end] = value;
+			if (start || end) {
+				const base = spec.shorten ? I18N.dateFormatter : I18N.dateTimeFormatter;
+				if (!start) {
+					return _.t("Until {0}", [base.format(end)]);
+				}
+				else if (!end) {
+					return _.t("{0} until present", [base.format(start)]);
+				}
+				else {
+					return base.formatRange(start, end);
+				}
+			}
+		} catch (error) {}
+
+		return DataTypes.null();
 	},
 
 	formatTemporalExtents(value, field, spec = {}) {