Bug 1341561: List of installled updates in about:support says "security updates" for Nightly and they are not security fixes
MozReview-Commit-ID: GENcLvpp4bb
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -17,16 +17,17 @@ updateName=%S %S
# %2$S is the update version - provided by the update xml. Ex: version 10.0.5
# %3$S is the build identifier - provided by the update xml. Ex: 20081022033543
updateNightlyName=%1$S %2$S %3$S nightly
intro_major=Do you want to upgrade to %1$S %2$S now?
intro_minor=A security and stability update for %1$S is available:
updateType_major=New Version
updateType_minor=Security Update
+updateType_nightly=Regular Update
# LOCALIZATION NOTE: When present %S is brandShortName
verificationError=%S could not confirm the integrity of the update package.
resumePausedAfterCloseTitle=Software Update
resumePausedAfterCloseMsg=You have paused downloading this update. Do you want to download the update in the background while you continue to use %S?
updaterIOErrorTitle=Software Update Failed
updaterIOErrorMsg=The update could not be installed. Please make sure there are no other copies of %S running on your computer, and then restart %S to try again.
okButton=OK
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -1,13 +1,14 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+Components.utils.import("resource://gre/modules/AppConstants.jsm");
const NS_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
var gUpdateHistory = {
_view: null,
/**
* Initialize the User Interface
*/
@@ -33,16 +34,18 @@ var gUpdateHistory = {
// valid statusText for the UI (bug 485493).
if (!update.statusText)
continue;
var element = document.createElementNS(NS_XUL, "update");
this._view.appendChild(element);
element.name = bundle.getFormattedString("updateFullName",
[update.name, update.buildID]);
+ if (AppConstants.NIGHTLY_BUILD)
+ update.type = "nightly";
element.type = bundle.getString("updateType_" + update.type);
element.installDate = this._formatDate(update.installDate);
if (update.detailsURL)
element.detailsURL = update.detailsURL;
else
element.hideDetailsURL = true;
element.status = update.statusText;
}