wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

strings for Bug 595455 - After several background update check failures notify the user that they should check if there is a new version available. r=dtownsend, ui-r=beltzner, a=blocking2.0-beta6

Browse Source
This commit is contained in:
Robert Strong 2010-09-13 23:57:39 -07:00
parent 7b1035eb29
commit b270b3d18b
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
View File

@ -63,8 +63,10 @@
<!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 genericBackgroundError.label "&brandShortName; is unable to determine if there is an update available. Please
make sure that you have the latest version of &brandShortName; from:">
<!ENTITY errorCertAttrNoUpdate2.label "Something is preventing &brandShortName; from updating securely.
Please make sure that you have the latest version of &brandShortName; from:">
<!ENTITY errorCertAttrHasUpdate.label "Something is trying to trick &brandShortName; into accepting an
insecure update. Please contact your network provider and seek help.">

9
toolkit/mozapps/update/content/updates.js
View File

@ -405,7 +405,7 @@ var gUpdates = {
this.setUpdate(arg0);
if (this.update.errorCode == CERT_ATTR_CHECK_FAILED_NO_UPDATE ||
this.update.errorCode == CERT_ATTR_CHECK_FAILED_HAS_UPDATE) {
aCallback("errorcertcheck");
aCallback("errorextra");
return;
}
@ -667,7 +667,7 @@ var gCheckingPage = {
if (update.errorCode &&
(update.errorCode == CERT_ATTR_CHECK_FAILED_NO_UPDATE ||
update.errorCode == CERT_ATTR_CHECK_FAILED_HAS_UPDATE )) {
gUpdates.wiz.goTo("errorcertcheck");
gUpdates.wiz.goTo("errorextra");
}
else {
gUpdates.wiz.goTo("errors");
@ -1610,9 +1610,10 @@ var gErrorsPage = {
};
/**
* The page shown when there is a certificate attribute check error.
* The page shown when there is a background check or a certificate attribute
* error.
*/
var gErrorCertCheckPage = {
var gErrorExtraPage = {
/**
* Initialize
*/

10
toolkit/mozapps/update/content/updates.xul
View File

@ -230,15 +230,17 @@
</vbox>
</wizardpage>
<wizardpage id="errorcertcheck" pageid="errorcertcheck"
object="gErrorCertCheckPage"
onpageshow="gErrorCertCheckPage.onPageShow();">
<wizardpage id="errorextra" pageid="errorextra"
object="gErrorExtraPage"
onpageshow="gErrorExtraPage.onPageShow();">
<updateheader label="&error.title;"/>
<vbox class="update-content" flex="1">
<label id="errorCertAttrHasUpdateLabel"
hidden="true">&errorCertAttrHasUpdate.label;</label>
<label id="errorCertCheckNoUpdateLabel"
hidden="true">&errorCertAttrNoUpdate.label;</label>
hidden="true">&errorCertAttrNoUpdate2.label;</label>
<label id="genericBackgroundErrorLabel"
hidden="true">&genericBackgroundError.label;</label>
<hbox>
<label id="errorCertAttrLinkLabel" class="text-link" hidden="true"
value="" onclick="openUpdateURL(event);"/>

2
toolkit/mozapps/update/test/chrome/test_0131_check_invalidCertAttrs_noUpdate.xul
View File

@ -24,7 +24,7 @@
const TESTS = [ {
pageid: PAGEID_CHECKING
}, {
pageid: PAGEID_ERROR_CERT_CHECK,
pageid: PAGEID_ERROR_EXTRA,
extraDelayedCheckFunction: checkCertErrorPage,
shouldBeHidden: false,
buttonClick: "finish"

2
toolkit/mozapps/update/test/chrome/test_0132_check_invalidCertAttrs_hasUpdate.xul
View File

@ -24,7 +24,7 @@
const TESTS = [ {
pageid: PAGEID_CHECKING
}, {
pageid: PAGEID_ERROR_CERT_CHECK,
pageid: PAGEID_ERROR_EXTRA,
extraDelayedCheckFunction: checkCertErrorPage,
shouldBeHidden: true,
buttonClick: "finish"

2
toolkit/mozapps/update/test/chrome/test_0141_notify_invalidCertAttrs_noUpdate.xul
View File

@ -22,7 +22,7 @@
<![CDATA[
const TESTS = [ {
pageid: PAGEID_ERROR_CERT_CHECK,
pageid: PAGEID_ERROR_EXTRA,
extraDelayedCheckFunction: checkCertErrorPage,
shouldBeHidden: false,
buttonClick: "finish"

2
toolkit/mozapps/update/test/chrome/test_0142_notify_invalidCertAttrs_hasUpdate.xul
View File

@ -22,7 +22,7 @@
<![CDATA[
const TESTS = [ {
pageid: PAGEID_ERROR_CERT_CHECK,
pageid: PAGEID_ERROR_EXTRA,
extraDelayedCheckFunction: checkCertErrorPage,
shouldBeHidden: true,
buttonClick: "finish"

4
toolkit/mozapps/update/test/chrome/utils.js
View File

@ -127,7 +127,7 @@ const PAGEID_LICENSE = "license"; // Done
const PAGEID_INCOMPAT_LIST = "incompatibleList"; // Done
const PAGEID_DOWNLOADING = "downloading"; // Done
const PAGEID_ERRORS = "errors"; // Done
const PAGEID_ERROR_CERT_CHECK = "errorcertcheck"; // Done
const PAGEID_ERROR_EXTRA = "errorextra"; // Done
const PAGEID_ERROR_PATCHING = "errorpatching"; // Done
const PAGEID_FINISHED = "finished"; // Done
const PAGEID_FINISHED_BKGRD = "finishedBackground"; // Done
@ -454,7 +454,7 @@ function getExpectedButtonStates() {
case PAGEID_NO_UPDATES_FOUND:
case PAGEID_MANUAL_UPDATE:
case PAGEID_ERRORS:
case PAGEID_ERROR_CERT_CHECK:
case PAGEID_ERROR_EXTRA:
case PAGEID_INSTALLED:
return { finish: { disabled: false, hidden: false } };
case PAGEID_ERROR_PATCHING: