Bug 1252670 - hard-code URL to SUMO article about desktop runtime being disabled; r=marco
authorMyk Melez <myk@mykzilla.org>
Tue, 01 Mar 2016 15:00:02 -0800
changeset 322664 952e06e0b849d497546ad42bfff4d3a7873e810f
parent 322663 91eedd43f7cf97300e8a1fe6aac73213bf49bcff
child 322665 f4fdf1a5e7e71258e7e50a2c504d9b640ed4ac34
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarco
bugs1252670
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1252670 - hard-code URL to SUMO article about desktop runtime being disabled; r=marco
webapprt/Startup.jsm
webapprt/locales/en-US/webapprt/webapp.properties
--- a/webapprt/Startup.jsm
+++ b/webapprt/Startup.jsm
@@ -108,19 +108,23 @@ this.startup = function(window) {
     let checkState = { value: Services.prefs.prefHasUserValue(SHOW_DISABLE_WARNING_PREF) ?
                               Services.prefs.getBoolPref(SHOW_DISABLE_WARNING_PREF) : true };
     if (checkState.value) {
       const webappBundle = Services.strings.createBundle("chrome://webapprt/locale/webapp.properties");
 
       let windowTitle = webappBundle.GetStringFromName("disable-warning.title");
       let windowText = webappBundle.GetStringFromName("disable-warning.description");
       let infoLabel = webappBundle.GetStringFromName("disable-warning.info.label");
-      let infoURL = webappBundle.GetStringFromName("disable-warning.info.url");
       let showAgainLabel = webappBundle.GetStringFromName("disable-warning.show-again");
 
+      // Hard-code the URL to the SUMO article, because SUMO will take care
+      // of directing users to the locale-appropriate version (or the en-US
+      // version if there isn't a version for the user's locale).
+      let infoURL = "https://support.mozilla.org/kb/runtime";
+
       let buttonFlags = (Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_OK) +
                         (Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_IS_STRING) +
                         Services.prompt.BUTTON_POS_0_DEFAULT;
 
       let rv = Services.prompt.confirmEx(
         window,
         windowTitle,
         windowText,
--- a/webapprt/locales/en-US/webapprt/webapp.properties
+++ b/webapprt/locales/en-US/webapprt/webapp.properties
@@ -50,10 +50,9 @@ webapps.uninstall.uninstall=Uninstall Ap
 webapps.uninstall.dontuninstall=Don't Uninstall
 
 paymentDialog.title=Payment
 paymentDialog.message=Which payment provider do you want to use?
 
 disable-warning.title=Warning: App Will Be Disabled
 disable-warning.description=This app will be disabled after you upgrade to a newer version of Firefox, which no longer includes a feature to run web apps separately from the browser.
 disable-warning.info.label=More information…
-disable-warning.info.url=https://support.mozilla.org/kb/runtime
 disable-warning.show-again=Show this warning the next time I start this app