Bug 1695596 - "Update Failed" buttons open channel-specific URLs. r=mkmelin

When an update fails, the prompt has "Download Manually" and "More Information"
buttons. They opened pages on thunderbird.net that are suitable for stable
releases, but not for beta.

Move the prefs in question to branding, and use the update channel name to set
beta and release specific URLs.

For all non-shippable builds that use "nightly" branding, just set both URLs to
www.thunderbird.net as there is no "Daily" download page and there are no "Daily"
release notes. This will also be used for local developer builds.

The new "details" URL for beta needs a PR merged on the website before it will
work.

Differential Revision: https://phabricator.services.mozilla.com/D148323

--HG--
rename : mail/branding/nightly/thunderbird-branding.js => mail/branding/nightly/pref/thunderbird-branding.js
rename : mail/branding/thunderbird/thunderbird-branding.js => mail/branding/thunderbird/pref/thunderbird-branding.js
extra : moz-landing-system : lando

mail/app/profile/all-thunderbird.js

@@ -59,15 +59,9 @@ pref("app.update.log", false);
 pref("app.update.staging.enabled", true);
 
 // Update service URL:
-pref("app.update.url", "https://aus.thunderbird.net/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-
-// URL user can browse to manually if for some reason all update installation
-// attempts fail.
-pref("app.update.url.manual", "https://www.thunderbird.net");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/%APP%/releases/");
-
+// app.update.url was removed in Bug 1630041
+// app.update.url.manual is in branding section
+// app.update.url.details is in branding section
 // app.update.promptWaitTime is in branding section
 
 // Whether or not to attempt using the service for updates.

mail/branding/branding-common.mozbuild

@@ -7,9 +7,14 @@
 
 @template
 def ThunderbirdBranding():
-    JS_PREFERENCE_FILES += [
-        "thunderbird-branding.js",
-    ]
+    if CONFIG["MOZ_BRANDING_DIRECTORY"] == "comm/mail/branding/thunderbird":
+        JS_PREFERENCE_PP_FILES += [
+            "pref/thunderbird-branding.js",
+        ]
+    else:
+        JS_PREFERENCE_FILES += [
+            "pref/thunderbird-branding.js",
+        ]
 
     if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
         FINAL_TARGET_FILES += [

mail/branding/nightly/pref/thunderbird-branding.js

@@ -8,6 +8,14 @@ pref("mailnews.start_page.url", "https://live.thunderbird.net/%APP%/start?locale
 // start page override to load after an update
 pref("mailnews.start_page.override_url", "https://live.thunderbird.net/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%&oldversion=%OLD_VERSION%");
 
+// There's no Thunderbird Daily specific page or release notes
+// URL user can browse to manually if for some reason all update installation
+// attempts fail.
+pref("app.update.url.manual", "https://www.thunderbird.net/");
+// A default value for the "More information about this update" link
+// supplied in the "An update is available" page of the update wizard.
+pref("app.update.url.details", "https://www.thunderbird.net/");
+
 // Interval: Time between checks for a new version (in seconds)
 // nightly=1 hour, official=24 hours
 pref("app.update.interval", 3600);

mail/branding/thunderbird/pref/thunderbird-branding.js

@@ -5,6 +5,20 @@ pref("mailnews.start_page.url", "https://live.thunderbird.net/%APP%/start?locale
 // url for this, see whats_new_page.yml
 pref("mailnews.start_page.override_url", "");
 
+// app.update.url.manual: URL user can browse to manually if for some reason
+// all update installation attempts fail.
+// app.update.url.details: a default value for the "More information about this
+// update" link supplied in the "An update is available" page of the update
+// wizard.
+#if MOZ_UPDATE_CHANNEL == beta
+  pref("app.update.url.manual", "https://www.thunderbird.net/%LOCALE%/download/beta/");
+  pref("app.update.url.details", "https://www.thunderbird.net/notes/beta/");
+#else
+  // release channel
+  pref("app.update.url.manual", "https://www.thunderbird.net/");
+  pref("app.update.url.details", "https://www.thunderbird.net/notes/");
+#endif
+
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 86400);