From d0b7069d1c4416f5163a978822cb206281cb82c1 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 4 Dec 2020 16:37:02 +0000 Subject: Issue #1694 - Part 1: Use scriptabledateformat for the Cookie Accept dialog. --- .../cookie/content/cookieAcceptDialog.js | 30 +++++++++++++++++----- .../chrome/cookie/cookieAcceptDialog.properties | 2 ++ 2 files changed, 26 insertions(+), 6 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/cookie/content/cookieAcceptDialog.js b/toolkit/components/cookie/content/cookieAcceptDialog.js index 4b322e95d..5f5760305 100644 --- a/toolkit/components/cookie/content/cookieAcceptDialog.js +++ b/toolkit/components/cookie/content/cookieAcceptDialog.js @@ -13,6 +13,7 @@ Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); var params; var cookieBundle; +var gDateService = null; var showDetails = ""; var hideDetails = ""; @@ -38,6 +39,14 @@ function onload() document.getElementById("cancel").setAttribute("icon", "cancel"); document.getElementById("disclosureButton").setAttribute("icon", "properties"); + // Initialize the date formatter + if (!gDateService) { + const nsScriptableDateFormat_CONTRACTID = "@mozilla.org/intl/scriptabledateformat;1"; + const nsIScriptableDateFormat = Components.interfaces.nsIScriptableDateFormat; + gDateService = Components.classes[nsScriptableDateFormat_CONTRACTID] + .getService(nsIScriptableDateFormat); + } + cookieBundle = document.getElementById("cookieBundle"); // cache strings @@ -174,12 +183,21 @@ function cookieDeny() function GetExpiresString(secondsUntilExpires) { if (secondsUntilExpires) { var date = new Date(1000*secondsUntilExpires); - 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); + + // if a server manages to set a really long-lived cookie, the dateservice + // can't cope with it properly, so we'll return a descriptive string instead. + var expiry = ""; + try { + expiry = gDateService.FormatDateTime("", gDateService.dateFormatLong, + gDateService.timeFormatSeconds, + date.getFullYear(), date.getMonth()+1, + date.getDate(), date.getHours(), + date.getMinutes(), date.getSeconds()); + } catch (ex) { + // Expiry duration was out of range for the date formatter, meaning a silly long time. + expiry = cookieBundle.getString("expireInAVeryLongTime"); + } + return expiry; } return cookieBundle.getString("expireAtEndOfSession"); } diff --git a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties index bba121498..698c6f010 100644 --- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties +++ b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties @@ -7,6 +7,8 @@ domainColon=Domain: forSecureOnly=Encrypted connections only forAnyConnection=Any type of connection expireAtEndOfSession=At end of session +# LOCALIZATION NOTE (expireInAVeryLongTime) This string is used if a cookie won't expire for a literal life age and then some. +expireInAVeryLongTime=Not in your lifetime showDetails=Show Details hideDetails=Hide Details -- cgit v1.2.3 From 68299c8613fd2117c5087ec1dfa44ce5a9978f8d Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 4 Dec 2020 16:41:24 +0000 Subject: Issue #1694 - Part 2: Use scriptabledateformat for Update History display. --- toolkit/mozapps/update/content/history.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'toolkit') 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()); } }; -- cgit v1.2.3 From cd17592001225e2d988c3aca9bd700de3c8ce4a3 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 15 Dec 2020 11:33:29 +0000 Subject: [toolkit] Handle corner case confusion of downloaded files without extension. See code comment for details. --- .../components/jsdownloads/src/DownloadIntegration.jsm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'toolkit') diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm index 7656128d2..ce525d4aa 100644 --- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm +++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm @@ -718,6 +718,22 @@ this.DownloadIntegration = { return; } +#ifdef XP_WIN + // When a file has no extension, and there's an executable file with the + // same name in the same folder, the Windows shell can get confused. + // For this reason, we show the file in the containing folder instead of + // trying to open it. + // We also don't trust mimeinfo; it could be a type we can forward to a + // system handler, but it could also be an executable type, and we + // don't have an exhaustive list with all of them. + if (!fileExtension) { + // We can't check for the existence of a same-name file with every + // possible executable extension, so this is a catch-all. + this.showContainingDirectory(aDownload.target.path); + return; + } +#endif + // No custom application chosen, let's launch the file with the default // handler. First, let's try to launch it through the MIME service. if (mimeInfo) { -- cgit v1.2.3