Bug 1550858 - Update final final final final final actions or urls a=jcristau
authorEd Lee <edilee@mozilla.com>
Mon, 17 Jun 2019 18:33:09 +0300
changeset 536983 c6cf0c6f2c8933b53f6112865be891feb549b301
parent 536982 23e2a740c60f3c90d0242cc21f0025bc0b26debe
child 536984 e61f8c9dad77696aacec8206ac567d98de3ba6f5
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcristau
bugs1550858
milestone68.0
Bug 1550858 - Update final final final final final actions or urls a=jcristau Reviewers: k88hudson, r1cky Reviewed By: r1cky Bug #: 1550858 Differential Revision: https://phabricator.services.mozilla.com/D34003
browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -1,16 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 const {Localization} = ChromeUtils.import("resource://gre/modules/Localization.jsm");
 const {FxAccountsConfig} = ChromeUtils.import("resource://gre/modules/FxAccountsConfig.jsm");
 const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
 const {AddonRepository} = ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 async function getAddonInfo() {
   try {
     let {content, source} = await AttributionCode.getAttrDataAsync();
     if (!content || source !== "addons.mozilla.org") {
       return null;
     }
     // Attribution data can be double encoded
@@ -218,17 +219,20 @@ const ONBOARDING_MESSAGES = async () => 
     bundled: 3,
     order: 2,
     content: {
       title: {string_id: "onboarding-tracking-protection-title2"},
       text: {string_id: "onboarding-tracking-protection-text2"},
       icon: "tracking",
       primary_button: {
         label: {string_id: "onboarding-tracking-protection-button2"},
-        action: {
+        action: Services.locale.appLocaleAsLangTag.substr(0, 2) === "en" ? {
+          type: "OPEN_URL",
+          data: {args: "https://mzl.la/ETPdefault", where: "tabshifted"},
+        } : {
           type: "OPEN_PREFERENCES_PAGE",
           data: {category: "privacy-trackingprotection"},
         },
       },
     },
     targeting: "trailheadTriplet == 'privacy'",
     trigger: {id: "showOnboarding"},
   },
@@ -338,17 +342,17 @@ const ONBOARDING_MESSAGES = async () => 
     content: {
       title: {string_id: "onboarding-send-tabs-title"},
       text: {string_id: "onboarding-send-tabs-text"},
       icon: "sendtab",
       primary_button: {
         label: {string_id: "onboarding-send-tabs-button"},
         action: {
           type: "OPEN_URL",
-          data: {args: "https://support.mozilla.org/kb/send-tab-firefox-desktop-mobile", where: "tabshifted"},
+          data: {args: "https://support.mozilla.org/kb/send-tab-firefox-desktop-other-devices", where: "tabshifted"},
         },
       },
     },
     targeting: "trailheadTriplet == 'multidevice'",
     trigger: {id: "showOnboarding"},
   },
   {
     id: "TRAILHEAD_CARD_8",