Issue #31 - Part 4: Use nsIScriptableDateFormat in cookie preferences.

1 files changed, 10 insertions, 6 deletions

diff --git a/basilisk/components/preferences/cookies.js b/basilisk/components/preferences/cookies.js
index d44e9ee..b63072b 100644
--- a/basilisk/components/preferences/cookies.js
+++ b/basilisk/components/preferences/cookies.js
@@ -12,6 +12,8 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 var gCookiesWindow = {
   _cm               : Components.classes["@mozilla.org/cookiemanager;1"]
                                 .getService(Components.interfaces.nsICookieManager),
+  _ds               : Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
+                                .getService(Components.interfaces.nsIScriptableDateFormat),
   _hosts            : {},
   _hostOrder        : [],
   _tree             : null,
@@ -490,12 +492,14 @@ var gCookiesWindow = {
   formatExpiresString: function (aExpires) {
     if (aExpires) {
       var date = new Date(1000 * aExpires);
-      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 this._ds.FormatDateTime("", this._ds.dateFormatLong,
+                                     this._ds.timeFormatSeconds,
+                                     date.getFullYear(),
+                                     date.getMonth() + 1,
+                                     date.getDate(),
+                                     date.getHours(),
+                                     date.getMinutes(),
+                                     date.getSeconds());
     }
     return this._bundle.getString("expireAtEndOfSession");
   },