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

Bug 316382 – Bad information text "Firefox may check periodically for new updates". r=robstrong, ui-r=madhava

Browse Source
This commit is contained in:
Rob Campbell 2008-08-13 08:38:46 +02:00
parent 3001579d7d
commit 4c5341b4ae
3 changed files with 21 additions and 5 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

@ -10,8 +10,10 @@
<!ENTITY cancel.accesskey "C">
<!ENTITY noupdatesfound.title "No Updates Found">
<!ENTITY noupdatesfound.intro "There are no new updates available. &brandShortName; may check
periodically for new updates.">
<!ENTITY noupdatesautoenabled.intro "There are no updates available. &brandShortName; will check
periodically for updates.">
<!ENTITY noupdatesautodisabled.intro "There are no updates available. Please check again later or enable
&brandShortName;'s automatic update checking.">
<!ENTITY incompatibleChecking.label "Checking if this update will cause problems with your extensions and/or themes…">
<!ENTITY clickHere.label "View more information about this update">

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

@ -47,6 +47,7 @@ const PREF_UPDATE_NAGTIMER_RESTART = "app.update.nagTimer.restart";
const PREF_APP_UPDATE_LOG_BRANCH = "app.update.log.";
const PREF_UPDATE_TEST_LOOP = "app.update.test.loop";
const PREF_UPDATE_NEVER_BRANCH = "app.update.never.";
const PREF_AUTO_UPDATE_ENABLED = "app.update.enabled";
const UPDATE_TEST_LOOP_INTERVAL = 2000;
@ -584,7 +585,13 @@ var gCheckingPage = {
"Could not select an appropriate update, either because there " +
"were none, or |selectUpdate| failed.");
var checking = document.getElementById("checking");
checking.setAttribute("next", "noupdatesfound");
// is auto update enabled?
if (getPref("getBoolPref", PREF_AUTO_UPDATE_ENABLED, true))
checking.setAttribute("next", "noupdatesautoenabled");
else
checking.setAttribute("next", "noupdatesautodisabled");
}
gUpdates.wiz.canAdvance = true;
gUpdates.wiz.advance();

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

@ -79,10 +79,17 @@
<progressmeter id="checkingProgress" mode="undetermined"/>
</wizardpage>
<wizardpage id="noupdatesfound" pageid="noupdatesfound"
<wizardpage id="noupdatesautoenabled" pageid="noupdatesautoenabled"
label="&noupdatesfound.title;" object="gNoUpdatesPage"
onpageshow="gNoUpdatesPage.onPageShow();">
<label>&noupdatesfound.intro;</label>
<label>&noupdatesautoenabled.intro;</label>
</wizardpage>
<!-- if auto updates are disabled, show the following page instead -->
<wizardpage id="noupdatesautodisabled" pageid="noupdatesautodisabled"
label="&noupdatesfound.title;" object="gNoUpdatesPage"
onpageshow="gNoUpdatesPage.onPageShow();">
<label>&noupdatesautodisabled.intro;</label>
</wizardpage>
<!-- next is "downloading" by default, but could change to "license"