57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||
|
|
# Parent b4176bad9f5de3ac410a170c287bed24c54ab13e
|
||
|
|
Don't show the update channel if the updater is disabled
|
||
|
|
|
||
|
|
diff --git a/mail/base/content/aboutDialog.js b/mail/base/content/aboutDialog.js
|
||
|
|
--- a/mail/base/content/aboutDialog.js
|
||
|
|
+++ b/mail/base/content/aboutDialog.js
|
||
|
|
@@ -72,21 +72,21 @@ function init(aEvent)
|
||
|
|
if (/a\d+(pre)?$/.test(version)) {
|
||
|
|
let buildID = Services.appinfo.appBuildID;
|
||
|
|
let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
|
||
|
|
document.getElementById("version").value += " (" + buildDate + ")";
|
||
|
|
}
|
||
|
|
|
||
|
|
#ifdef MOZ_UPDATER
|
||
|
|
gAppUpdater = new appUpdater();
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
let defaults = Services.prefs.getDefaultBranch("");
|
||
|
|
let channelLabel = document.getElementById("currentChannel");
|
||
|
|
channelLabel.value = defaults.getCharPref("app.update.channel");
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#ifdef XP_MACOSX
|
||
|
|
// it may not be sized at this point, and we need its width to calculate its position
|
||
|
|
window.sizeToContent();
|
||
|
|
window.moveTo((screen.availWidth / 2) - (window.outerWidth / 2), screen.availHeight / 5);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/mail/base/content/aboutDialog.xul b/mail/base/content/aboutDialog.xul
|
||
|
|
--- a/mail/base/content/aboutDialog.xul
|
||
|
|
+++ b/mail/base/content/aboutDialog.xul
|
||
|
|
@@ -107,19 +107,21 @@
|
||
|
|
<label>&update.noUpdatesFound;</label>
|
||
|
|
</hbox>
|
||
|
|
<hbox id="manualUpdate" align="center">
|
||
|
|
<label>&update.manual.start;</label><label id="manualLink" class="text-link">&update.manual.linkText;</label><label>&update.manual.end;</label>
|
||
|
|
</hbox>
|
||
|
|
</deck>
|
||
|
|
#endif
|
||
|
|
</vbox>
|
||
|
|
+#ifdef MOZ_UPDATER
|
||
|
|
<description class="text-blurb" id="currentChannelText">
|
||
|
|
&channel.description.start;<label id="currentChannel"/>&channel.description.end;
|
||
|
|
</description>
|
||
|
|
+#endif
|
||
|
|
<description class="text-blurb" id="communityDesc">
|
||
|
|
&community.start2;<label class="text-link" onclick="openURL('http://www.mozilla.org/');" oncommand="openUILink(this.getAttribute('href'), event);">&community.mozillaLink;</label>&community.middle2;<label class="text-link" onclick="openAboutTab('about:credits');">&community.creditsLink;</label>&community.end2;
|
||
|
|
</description>
|
||
|
|
<description class="text-blurb" id="contributeDesc">
|
||
|
|
&contribute.start;<label class="text-link" onclick="openURL('http://www.mozilla.org/contribute/');">&contribute.getInvolvedLink;</label>&contribute.end;
|
||
|
|
</description>
|
||
|
|
</vbox>
|
||
|
|
</vbox>
|