зеркало из https://github.com/mozilla/gecko-dev.git
Bug 480178 - Billboard should extend to available space and the update UI should be the same width for all locales. Patch 3 - string changes. r=dtownsend, ui-r=faaborg
This commit is contained in:
Robert Strong
Родитель
080d756c8d
Коммит
dbc1c40e97
|
|
@ -1,13 +0,0 @@
|
|||
|
||||
<!ENTITY incompatible.title "Incompatible Items">
|
||||
<!ENTITY incompatible.intro "The following items are not compatible with this update to &brandShortName; and
|
||||
will be disabled when it is installed:">
|
||||
<!ENTITY incompatible.update "&brandShortName; will periodically check for updates to them in the event that
|
||||
a compatible version becomes available.">
|
||||
<!ENTITY incompatible.suffix "&brandShortName; updates contain important security improvements. For your
|
||||
protection, it is highly recommended that you update &brandShortName; even
|
||||
if some of your Extensions and Themes become incompatible.">
|
||||
|
||||
<!ENTITY closebutton.label "Close">
|
||||
|
||||
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
<!ENTITY updateWizard.title "Software Update">
|
||||
|
||||
<!ENTITY window.width "36em">
|
||||
<!ENTITY window.macWidth "39em">
|
||||
|
||||
<!ENTITY checking.title "Checking for Updates">
|
||||
<!ENTITY updateCheck.label "Looking for newer versions of &brandShortName;…">
|
||||
|
||||
|
|
@ -44,7 +41,7 @@
|
|||
|
||||
<!ENTITY incompatibleList.title "Incompatible Add-ons Found">
|
||||
|
||||
<!ENTITY downloading.title "Downloading Update">
|
||||
<!ENTITY downloadPage.title "Downloading &brandShortName;">
|
||||
<!ENTITY downloading.intro "Downloading the update…">
|
||||
<!ENTITY connecting.label "Connecting to the update server…">
|
||||
<!ENTITY verificationFailedText.label "&brandShortName; was unable to verify the integrity of the
|
||||
|
|
|
|||
|
|
@ -77,8 +77,6 @@ patchApplyFailure=The Update could not be installed (patch apply failed)
|
|||
|
||||
# LOCALIZATION NOTE: When present %S is the update name provided by the remote
|
||||
# update xml for the following
|
||||
downloadingPrefix=Downloading %S…
|
||||
pausedName=Paused downloading %S
|
||||
updateAvailable_minor.title=%S available
|
||||
updateAvailable_minor.text=Download & Install…
|
||||
updateAvailable_major.title=%S available
|
||||
|
|
@ -89,8 +87,8 @@ updateDownloaded_major.title=%S available
|
|||
updateDownloaded_major.text=Install the new version…
|
||||
|
||||
# LOCALIZATION NOTE: %S is the amount downloaded so far
|
||||
# example: Downloaded 879 KB of 2.1 MB
|
||||
pausedStatus=Downloaded %S
|
||||
# example: Paused — 879 KB of 2.1 MB
|
||||
downloadPausedStatus=Paused — %S
|
||||
|
||||
check_error-200=Update XML file malformed (200)
|
||||
check_error-403=Access denied (403)
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@
|
|||
locale/@AB_CD@/mozapps/profile/profileSelection.dtd (%chrome/mozapps/profile/profileSelection.dtd)
|
||||
locale/@AB_CD@/mozapps/update/updates.dtd (%chrome/mozapps/update/updates.dtd)
|
||||
locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties)
|
||||
locale/@AB_CD@/mozapps/update/incompatible.dtd (%chrome/mozapps/update/incompatible.dtd)
|
||||
locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd)
|
||||
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/xpinstall/xpinstallConfirm.dtd)
|
||||
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/xpinstall/xpinstallConfirm.properties)
|
||||
|
|
|
|||
|
|
@ -1149,7 +1149,6 @@ var gDownloadingPage = {
|
|||
/**
|
||||
* DOM Elements
|
||||
*/
|
||||
_downloadName: null,
|
||||
_downloadStatus: null,
|
||||
_downloadProgress: null,
|
||||
_pauseButton: null,
|
||||
|
|
@ -1175,7 +1174,6 @@ var gDownloadingPage = {
|
|||
* Initialize
|
||||
*/
|
||||
onPageShow: function() {
|
||||
this._downloadName = document.getElementById("downloadName");
|
||||
this._downloadStatus = document.getElementById("downloadStatus");
|
||||
this._downloadProgress = document.getElementById("downloadProgress");
|
||||
this._pauseButton = document.getElementById("pauseButton");
|
||||
|
|
@ -1233,12 +1231,6 @@ var gDownloadingPage = {
|
|||
LOG("gDownloadingPage", "onPageShow - error: " + e);
|
||||
}
|
||||
|
||||
var link = document.getElementById("downloadDetailsLink");
|
||||
if (gUpdates.update.detailsURL)
|
||||
link.setAttribute("url", gUpdates.update.detailsURL);
|
||||
else
|
||||
link.hidden = true;
|
||||
|
||||
gUpdates.setButtons("hideButton", null, null, false);
|
||||
gUpdates.wiz.getButton("extra1").focus();
|
||||
},
|
||||
|
|
@ -1290,22 +1282,19 @@ var gDownloadingPage = {
|
|||
if (paused) {
|
||||
if (this._downloadProgress.mode != "normal")
|
||||
this._downloadProgress.mode = "normal";
|
||||
this._downloadName.value = gUpdates.getAUSString("pausedName", [u.name]);
|
||||
this._pauseButton.setAttribute("tooltiptext",
|
||||
gUpdates.getAUSString("pauseButtonResume"));
|
||||
this._pauseButton.setAttribute("paused", "true");
|
||||
var p = u.selectedPatch.QueryInterface(CoI.nsIPropertyBag);
|
||||
var status = p.getProperty("status");
|
||||
if (status) {
|
||||
let pausedStatus = gUpdates.getAUSString("pausedStatus", [status]);
|
||||
let pausedStatus = gUpdates.getAUSString("downloadPausedStatus", [status]);
|
||||
this._setStatus(pausedStatus);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (this._downloadProgress.mode != "undetermined")
|
||||
this._downloadProgress.mode = "undetermined";
|
||||
this._downloadName.value = gUpdates.getAUSString("downloadingPrefix",
|
||||
[u.name]);
|
||||
this._pauseButton.setAttribute("paused", "false");
|
||||
this._pauseButton.setAttribute("tooltiptext",
|
||||
gUpdates.getAUSString("pauseButtonPause"));
|
||||
|
|
@ -1420,7 +1409,6 @@ var gDownloadingPage = {
|
|||
onProgress: function(request, context, progress, maxProgress) {
|
||||
LOG("gDownloadingPage", "onProgress - progress: " + progress + "/" +
|
||||
maxProgress);
|
||||
var name = gUpdates.getAUSString("downloadingPrefix", [gUpdates.update.name]);
|
||||
let status = this._updateDownloadStatus(progress, maxProgress);
|
||||
var currentProgress = Math.round(100 * (progress / maxProgress));
|
||||
|
||||
|
|
@ -1440,8 +1428,6 @@ var gDownloadingPage = {
|
|||
this._downloadProgress.value = currentProgress;
|
||||
if (this._pauseButton.disabled)
|
||||
this._pauseButton.disabled = false;
|
||||
if (this._downloadName.value != name)
|
||||
this._downloadName.value = name;
|
||||
|
||||
// If the update has completed downloading and the download status contains
|
||||
// the original text return early to avoid an assertion in debug builds.
|
||||
|
|
|
|||
|
|
@ -194,15 +194,8 @@
|
|||
<wizardpage id="downloading" pageid="downloading" next="finished"
|
||||
object="gDownloadingPage" onextra1="gDownloadingPage.onHide();"
|
||||
onpageshow="gDownloadingPage.onPageShow();">
|
||||
<updateheader label="&downloading.title;"/>
|
||||
<updateheader label="&downloadPage.title;"/>
|
||||
<vbox class="update-content" flex="1">
|
||||
<hbox id="downloadStatusTop">
|
||||
<label id="downloadName" crop="right">&downloading.intro;</label>
|
||||
<spacer flex="1"/>
|
||||
<label id="downloadDetailsLink" class="text-link"
|
||||
value="&details.link;" onclick="openUpdateURL(event);"/>
|
||||
</hbox>
|
||||
<separator class="thin"/>
|
||||
<hbox id="downloadStatusProgress">
|
||||
<progressmeter id="downloadProgress" mode="undetermined" flex="1"/>
|
||||
<button id="pauseButton" oncommand="gDownloadingPage.onPause();"
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ wizardpage {
|
|||
}
|
||||
|
||||
/* Downloading Page */
|
||||
#downloadStatusTop, #downloadStatusLine {
|
||||
#downloadStatusLine {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ wizardpage {
|
|||
}
|
||||
|
||||
/* Downloading Page */
|
||||
#downloadStatusTop, #downloadStatusLine {
|
||||
#downloadStatusLine {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ wizardpage {
|
|||
}
|
||||
|
||||
/* Downloading Page */
|
||||
#downloadStatusTop, #downloadStatusLine {
|
||||
#downloadStatusLine {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче