Issue 5278 - Improved date formatting approach, in particular fixing broken formatting in 32-bit Li…

lib/utils.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 228 matching lines @@
     finally
     {
       if (stream)
         stream.close();
     }
   },
 
   /**
    * Formats a unix time according to user's locale.
    * @param {Integer} time  unix time in milliseconds
    * @return {String} formatted date and time

[Wladimir Palant, 2017/06/08 08:13:02]

Yes, I am aware of this not being entirely correct. Not going to polish this
however, with the entire code base being deprecated.

    */
   formatTime: function(time)
   {
     try
     {
-      let date = new Date(time);
-      return Utils.dateFormatter.FormatDateTime("", Ci.nsIScriptableDateFormat.dateFormatShort,
-                                                Ci.nsIScriptableDateFormat.timeFormatNoSeconds,
-                                                date.getFullYear(), date.getMonth() + 1, date.getDate(),
-                                                date.getHours(), date.getMinutes(), date.getSeconds());
+      return Utils.dateFormatter.format(time);

[Wladimir Palant, 2017/06/08 08:13:01]

The MDN documentation doesn't define the parameter here properly, with the
examples suggesting that Date objects are expected. However, the spec says that
the implementation needs to call ToNumber() on the parameter - so a numerical
representation of the date is perfectly fine.

     }
     catch(e)
     {
       // Make sure to return even on errors
       Cu.reportError(e);
       return "";
     }
   },
 
   /**
@@ skipping 283 matching lines @@
 XPCOMUtils.defineLazyServiceGetter(Utils, "promptService", "@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "effectiveTLD", "@mozilla.org/network/effective-tld-service;1", "nsIEffectiveTLDService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "netUtils", "@mozilla.org/network/util;1", "nsINetUtil");
 XPCOMUtils.defineLazyServiceGetter(Utils, "styleService", "@mozilla.org/content/style-sheet-service;1", "nsIStyleSheetService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "prefService", "@mozilla.org/preferences-service;1", "nsIPrefService");
 XPCOMUtils.defineLazyServiceGetter(Utils, "versionComparator", "@mozilla.org/xpcom/version-comparator;1", "nsIVersionComparator");
 XPCOMUtils.defineLazyServiceGetter(Utils, "windowMediator", "@mozilla.org/appshell/window-mediator;1", "nsIWindowMediator");
 XPCOMUtils.defineLazyServiceGetter(Utils, "windowWatcher", "@mozilla.org/embedcomp/window-watcher;1", "nsIWindowWatcher");
 XPCOMUtils.defineLazyServiceGetter(Utils, "chromeRegistry", "@mozilla.org/chrome/chrome-registry;1", "nsIXULChromeRegistry");
 XPCOMUtils.defineLazyServiceGetter(Utils, "systemPrincipal", "@mozilla.org/systemprincipal;1", "nsIPrincipal");
-XPCOMUtils.defineLazyServiceGetter(Utils, "dateFormatter", "@mozilla.org/intl/scriptabledateformat;1", "nsIScriptableDateFormat");
 XPCOMUtils.defineLazyServiceGetter(Utils, "httpProtocol", "@mozilla.org/network/protocol;1?name=http", "nsIHttpProtocolHandler");
 XPCOMUtils.defineLazyServiceGetter(Utils, "clipboard", "@mozilla.org/widget/clipboard;1", "nsIClipboard");
 XPCOMUtils.defineLazyServiceGetter(Utils, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper");
+XPCOMUtils.defineLazyGetter(Utils, "dateFormatter", function()
+{
+  return new Intl.DateTimeFormat(Utils.appLocale, {

[Wladimir Palant, 2017/06/08 08:13:01]

Originally, I meant to pass undefined as first parameter here, which should make
the browser fall back to the default locale (supposedly, system's locale).
However, this produced inconsistent results on my system which uses a mixture of
English and German locale settings (LANG=en_US.UTF-8, LC_TIME=de_DE.UTF-8).
Firefox 53 used the German date format whereas Firefox 55 and Chrome chose the
US format. So I thought that a date format matching our UI language might be
more consistent. Not really sure about the expectations of somebody using an
English-language browser however.

[Wladimir Palant, 2017/06/08 08:49:02]

After looking a bit more into this, the inconsistency appears to be a bug that
affects Date.toLocaleString() as well:
https://bugzilla.mozilla.org/show_bug.cgi?id=1346674#c16. It's probably better
to use the system-wide date format so I switched back to undefined here.

+    year: "numeric",
+    month: "numeric",
+    day: "numeric",
+    hour: "numeric",
+    minute: "numeric"
+  });
+});
 XPCOMUtils.defineLazyGetter(Utils, "crypto", function()
 {
   try
   {
     let ctypes = Cu.import("resource://gre/modules/ctypes.jsm", null).ctypes;
 
     let nsslib;
     try
     {
       nsslib = ctypes.open(ctypes.libraryName("nss3"));
@@ skipping 153 matching lines @@
     Cu.reportError(e);
     // Expected, ctypes isn't supported in Gecko 1.9.2
     return null;
   }
 });
 
 if ("@mozilla.org/messenger/headerparser;1" in Cc)
   XPCOMUtils.defineLazyServiceGetter(Utils, "headerParser", "@mozilla.org/messenger/headerparser;1", "nsIMsgHeaderParser");
 else
   Utils.headerParser = null;