Bug 583408 - Notify user when the certificate attribute check fails. r=dtownsend ui-r=beltzner a=blocking
authorRobert Strong <robert.bugzilla@gmail.com>
Sat, 28 Aug 2010 02:35:01 +0200
changeset 51639 998223ee5613daf69e71951def6c0668005f4c2b
parent 51638 0cfd71b0b6a4491d42541f24b6d4e7120704c081
child 51640 47e8d27d84dd6cff97e76cc387f590f8eccb4980
push id15376
push usermlamouri@mozilla.com
push dateSat, 28 Aug 2010 00:45:46 +0000
treeherdermozilla-central@8af40170cdb4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend, beltzner, blocking
bugs583408
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 583408 - Notify user when the certificate attribute check fails. r=dtownsend ui-r=beltzner a=blocking
toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
toolkit/locales/en-US/chrome/mozapps/update/updates.properties
toolkit/mozapps/update/content/updates.js
toolkit/mozapps/update/content/updates.xul
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
@@ -47,26 +47,32 @@
 <!ENTITY  verificationFailedText.label    "&brandShortName; was unable to verify the integrity of the 
                                            incremental update it downloaded, so it is now downloading
                                            the complete update package.">
 
 <!ENTITY  viewDetails.tooltip             "View details for this update">
 
 <!ENTITY  details.link                    "Details">
 
+<!ENTITY  error.title                     "Update Failed">
+
 <!ENTITY  error.label                     "There were problems checking for, downloading, or installing this 
                                            update. &brandShortName; could not be updated because:">
                                            
 <!ENTITY  errorManual.label               "You can update &brandShortName; manually by visiting this link
                                            and downloading the latest version:">
                                            
-<!ENTITY  errorpatching.title             "Update Failed">
 <!ENTITY  errorpatching.intro             "The partial Update could not be applied. 
                                            &brandShortName; will try again by downloading a complete Update.">
 
+<!ENTITY  errorCertAttrNoUpdate.label     "Something is preventing &brandShortName; from updating securely.
+                                           Please check you have the latest version of &brandShortName; at:">
+<!ENTITY  errorCertAttrHasUpdate.label    "Something is trying to trick &brandShortName; into accepting an
+                                           insecure update. Please contact your network provider and seek help.">
+
 <!ENTITY  finishedPage.title              "Update Ready to Install">
 <!ENTITY  finishedPage.text               "The update will be installed the next time &brandShortName; starts. You 
                                            can restart &brandShortName; now, or continue working and restart later.">
 
 <!ENTITY  finishedBackgroundPage.text     "A security and stability update for &brandShortName; has been
                                            downloaded and is ready to be installed.">
 <!ENTITY  finishedBackground.name         "Update:">
 <!-- LOCALIZATION NOTE (finishedBackground.more): This string describes the button labels defined by restartNowButton and restartLaterButton in updates.properties. -->
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -27,17 +27,16 @@ intro_minor=A security and stability upd
 # Example: 2.1.5
 addonLabel=%1$S %2$S
 
 updateType_major=New Version
 updateType_minor=Security Update
 
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S could not confirm the integrity of the update package.
-errorsPageHeader=Update Failed
 licenseContentNotFound=The license file for this version could not be found. Please visit the %S homepage for more information.
 updateMoreInfoContentNotFound=Additional details about this version could not be found. Please visit the %S homepage for more information.
 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
 okButton.accesskey=O
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -1574,19 +1574,16 @@ var gDownloadingPage = {
 var gErrorsPage = {
   /**
    * Initialize
    */
   onPageShow: function() {
     gUpdates.setButtons(null, null, "okButton", true);
     gUpdates.wiz.getButton("finish").focus();
 
-    var errorsTitle = gUpdates.getAUSString("errorsPageHeader");
-    document.getElementById("errorsHeader").setAttribute("label", errorsTitle);
-
     var statusText = gUpdates.update.statusText;
     LOG("gErrorsPage" , "onPageShow - update.statusText: " + statusText);
 
     var errorReason = document.getElementById("errorReason");
     errorReason.value = statusText;
     var manualURL = Services.urlFormatter.formatURLPref(PREF_APP_UPDATE_MANUAL_URL);
     var errorLinkLabel = document.getElementById("errorLinkLabel");
     errorLinkLabel.value = manualURL;
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -210,17 +210,17 @@
         <image id="verificationFailedIcon"/>
         <label flex="1">&verificationFailedText.label;</label>
       </hbox>
     </vbox>
   </wizardpage>
   
   <wizardpage id="errors" pageid="errors" object="gErrorsPage"
               onpageshow="gErrorsPage.onPageShow();">
-    <updateheader id="errorsHeader" label=""/>
+    <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label id="errorIntro">&error.label;</label>
       <separator/>
       <textbox class="plain" readonly="true" id="errorReason" multiline="true"
                rows="3"/>
       <separator/>
       <label id="errorManual">&errorManual.label;</label>
       <hbox>
@@ -228,17 +228,17 @@
                onclick="openUpdateURL(event);"/>
       </hbox>
     </vbox>
   </wizardpage>
   
   <wizardpage id="errorpatching" pageid="errorpatching" next="downloading"
               object="gErrorPatchingPage"
               onpageshow="gErrorPatchingPage.onPageShow();">
-    <updateheader label="&errorpatching.title;"/>
+    <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label>&errorpatching.intro;</label>
     </vbox>
   </wizardpage>
   
   <wizardpage id="finished" pageid="finished" object="gFinishedPage"
               onpageshow="gFinishedPage.onPageShow();"
               onextra1="gFinishedPage.onExtra1()">