[tbb-commits] [tor-launcher/master] Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat

[gk at torproject.org]

commit eccf3749f046da385eae27176f4c9e692a5784ff
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri May 4 21:17:32 2018 +0000

    Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat
    
    In bug 1313625 Mozilla ripped out support for nsIScriptableDateFormat
    because ECMAScript now has support for this.
    
    This change is based on bug 1383463.
---
 src/components/tl-protocol.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index 79b327e..6659621 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -13,6 +13,7 @@ const Cr = Components.results;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
                           "resource://torlauncher/modules/tl-util.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
@@ -636,10 +637,6 @@ TorProtocolService.prototype =
     let s = "";
     if (this.mTorLog)
     {
-      let dateFmtSvc = Cc["@mozilla.org/intl/scriptabledateformat;1"]
-                      .getService(Ci.nsIScriptableDateFormat);
-      let dateFormat = dateFmtSvc.dateFormatShort;
-      let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour;
       let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n";
       let count = this.mTorLog.length;
       if (aCountObj)
@@ -648,12 +645,16 @@ TorProtocolService.prototype =
       {
         let logObj = this.mTorLog[i];
         let secs = logObj.date.getSeconds();
-        let timeStr = dateFmtSvc.FormatDateTime("", dateFormat, timeFormat,
-                         logObj.date.getFullYear(), logObj.date.getMonth() + 1,
-                             logObj.date.getDate(), logObj.date.getHours(),
-                             logObj.date.getMinutes(), secs);
+
+        let options = { year: '2-digit', month: 'numeric', day: 'numeric',
+                hour: 'numeric', minute: 'numeric', second: 'numeric',
+                hour12: false };
+        let timeStr = new Intl.DateTimeFormat('en-US', options)
+                      .format(logObj.date, options);
+
         if (' ' == timeStr.substr(-1))
           timeStr = timeStr.substr(0, timeStr.length - 1);
+
         let fracSecsStr = "" + logObj.date.getMilliseconds();
         while (fracSecsStr.length < 3)
           fracSecsStr += "0";