Merge branch 'redwood' into releaseRC_20201215

1 files changed, 11 insertions, 6 deletions

diff --git a/toolkit/mozapps/update/content/history.js b/toolkit/mozapps/update/content/history.js
index c5bbccefc..809eee478 100644
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -58,13 +58,18 @@ var gUpdateHistory = {
    * @returns A human readable date string
    */
   _formatDate: function(seconds) {
+    var sdf =
+        Components.classes["@mozilla.org/intl/scriptabledateformat;1"].
+        getService(Components.interfaces.nsIScriptableDateFormat);
     var date = new Date(seconds);
-    const locale = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
-                   .getService(Components.interfaces.nsIXULChromeRegistry)
-                   .getSelectedLocale("global", true);
-    const dtOptions = { year: 'numeric', month: 'long', day: 'numeric',
-                        hour: 'numeric', minute: 'numeric', second: 'numeric' };
-    return date.toLocaleString(locale, dtOptions);
+    return sdf.FormatDateTime("", sdf.dateFormatLong,
+                              sdf.timeFormatSeconds,
+                              date.getFullYear(),
+                              date.getMonth() + 1,
+                              date.getDate(),
+                              date.getHours(),
+                              date.getMinutes(),
+                              date.getSeconds());
   }
 };