fix(android): date.toLocaleString() to default to numeric date/time

tidev · Dec 18, 2020 · 436c3a3 · 436c3a3
1 parent 6323c69
commit 436c3a3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/common/Resources/ti.internal/extensions/js/Date.js b/common/Resources/ti.internal/extensions/js/Date.js
@@ -37,5 +37,34 @@ if (OS_ANDROID) {
 		return formatter.format(this);
 	};
 
-	Date.prototype.toLocaleString = Date.prototype.toLocaleDateString;
+	Date.prototype.toLocaleString = function () {
+		const properties = Intl.DateTimeFormat._makeTiCreationPropertiesFrom(arguments);
+		const oldOptions = properties.options;
+		let hasOption = false;
+		if (oldOptions) {
+			hasOption
+				=  !!oldOptions.dateStyle
+				|| !!oldOptions.timeStyle
+				|| !!oldOptions.weekday
+				|| !!oldOptions.month
+				|| !!oldOptions.day
+				|| !!oldOptions.year
+				|| !!oldOptions.hour
+				|| !!oldOptions.minute
+				|| !!oldOptions.second;
+		}
+		if (!hasOption) {
+			const defaultOptions = {
+				month: 'numeric',
+				day: 'numeric',
+				year: 'numeric',
+				hour: 'numeric',
+				minute: 'numeric',
+				second: 'numeric'
+			};
+			properties.options = Object.assign(defaultOptions, oldOptions);
+		}
+		const formatter = new Intl.DateTimeFormat(properties.locale, properties.options);
+		return formatter.format(this);
+	};
 }
diff --git a/tests/Resources/date.test.js b/tests/Resources/date.test.js
@@ -12,8 +12,8 @@ const should = require('./utilities/assertions');
 
 describe('Date', function () {
 	it('#toLocaleString()', () => {
-		// 2020-March-1st
-		const date = new Date(2020, 2, 1);
+		// 2020-March-1st 08:02:05 PM
+		const date = new Date(2020, 2, 1, 20, 2, 5);
 		const options = {
 			year: 'numeric',
 			month: 'numeric',
@@ -35,10 +35,12 @@ describe('Date', function () {
 		should(date.toLocaleString('de-DE', options)).be.eql('1.3.2020');
 		should(date.toLocaleString('ja-JP', options)).be.eql('2020/3/1');
 
-		should(date.toLocaleDateString('en-US')).be.eql('3/1/2020');
-		should(date.toLocaleDateString('en-US', { year: 'numeric' })).be.eql('2020');
-		should(date.toLocaleDateString('en-US', { year: '2-digit' })).be.eql('20');
-		should(date.toLocaleDateString('en-US', { hour: 'numeric', hour12: true })).be.eql('3/1/2020, 12 AM');
+		should(date.toLocaleString('en-US')).be.equalOneOf([ '3/1/2020, 8:02:05 PM', '3/1/2020, 20:02:05' ]);
+		should(date.toLocaleString('en-US', { hour12: true })).be.eql('3/1/2020, 8:02:05 PM');
+		should(date.toLocaleString('en-US', { hour12: false })).be.eql('3/1/2020, 20:02:05');
+		should(date.toLocaleString('en-US', { year: 'numeric' })).be.eql('2020');
+		should(date.toLocaleString('en-US', { hour: 'numeric', hour12: true })).be.eql('8 PM');
+		should(date.toLocaleString('en-US', { weekday: 'long' }).toLowerCase()).be.eql('sunday');
 	});
 
 	it('#toLocaleDateString()', () => {