Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 757439 - Use the updateButton string for the Update & Restart button in the About dialog; r=rstrong

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-05-22 11:35:59 -04:00
parent de1ab21d09
commit 95d7f91ca4
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/base/content/aboutDialog.js
View File

@ -116,18 +116,12 @@ function appUpdater()
return;
}
if (this.isPending) {
if (this.isPending || this.isApplied) {
this.setupUpdateButton("update.restart." +
(this.isMajor ? "upgradeButton" : "updateButton"));
return;
}
if (this.isApplied) {
this.setupUpdateButton("update.restart." +
(this.isMajor ? "upgradeButton" : "restartButton"));
return;
}
if (this.isDownloading) {
this.startDownload();
return;
@ -539,7 +533,7 @@ appUpdater.prototype =
if (status == "applied" || status == "applied-service") {
self.selectPanel("updateButtonBox");
self.setupUpdateButton("update.restart." +
(self.isMajor ? "upgradeButton" : "restartButton"));
(self.isMajor ? "upgradeButton" : "updateButton"));
timer.cancel();
timer = null;
} else if (status == "failed") {

2
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -156,8 +156,6 @@ update.openUpdateUI.applyButton.label=Apply Update…
update.openUpdateUI.applyButton.accesskey=A
update.restart.updateButton.label=Restart to Update
update.restart.updateButton.accesskey=R
update.restart.restartButton.label=Update & Restart
update.restart.restartButton.accesskey=R
update.openUpdateUI.upgradeButton.label=Upgrade Now…
update.openUpdateUI.upgradeButton.accesskey=U
update.restart.upgradeButton.label=Upgrade Now