From 42eeb09e2f1b3b3c27f64180e7941e21bf94aa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Tue, 1 Nov 2016 09:20:48 -0700 Subject: [PATCH] Bug 1313795 - Remove Date.prototype.toLocaleFormat uses in toolkit/content/widgets. r=Neil --- .../content/tests/chrome/test_timepicker.xul | 3 ++- toolkit/content/widgets/datetimepicker.xml | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/toolkit/content/tests/chrome/test_timepicker.xul b/toolkit/content/tests/chrome/test_timepicker.xul index 81199683c757..98e370137f82 100644 --- a/toolkit/content/tests/chrome/test_timepicker.xul +++ b/toolkit/content/tests/chrome/test_timepicker.xul @@ -43,7 +43,8 @@ function testtag_timepicker() testtag_comparetime(tp, testid + "set value", thour, tminute, tsecond); var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/; - var fdt = new Date(2000,0,1,16,7,9).toLocaleFormat("%X"); + var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn"; + var fdt = new Date(2000,0,1,16,7,9).toLocaleTimeString(locale); is(tp.is24HourClock, Number(fdt.match(numberOrder)[2]) > 12, "is24HourClock"); // check that setting the dateValue property works diff --git a/toolkit/content/widgets/datetimepicker.xml b/toolkit/content/widgets/datetimepicker.xml index e18791c28dd1..5f16f1ff0c5f 100644 --- a/toolkit/content/widgets/datetimepicker.xml +++ b/toolkit/content/widgets/datetimepicker.xml @@ -482,7 +482,9 @@ var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/; - var pmTime = new Date(2000, 0, 1, 16, 7, 9).toLocaleFormat("%X"); + var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn"; + + var pmTime = new Date(2000, 0, 1, 16, 7, 9).toLocaleTimeString(locale); var numberFields = pmTime.match(numberOrder); if (numberFields) { this._separatorFirst.value = numberFields[3]; @@ -493,7 +495,7 @@ this.pmIndicator = numberFields[1] || numberFields[7]; } - var amTime = new Date(2000, 0, 1, 1, 7, 9).toLocaleFormat("%X"); + var amTime = new Date(2000, 0, 1, 1, 7, 9).toLocaleTimeString(locale); numberFields = amTime.match(numberOrder); if (numberFields) { this.hourLeadingZero = (numberFields[2].length > 1); @@ -770,7 +772,9 @@ var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/; - var dt = new Date(2002, 9, 4).toLocaleFormat("%x"); + var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn"; + + var dt = new Date(2002, 9, 4).toLocaleDateString(locale); var numberFields = dt.match(numberOrder); if (numberFields) { this._separatorFirst.value = numberFields[3]; @@ -994,11 +998,15 @@