From 5b7d65b7d8a64b30e0287eaf54c8bf3d1049c21f Mon Sep 17 00:00:00 2001 From: Ed Lee Date: Thu, 3 Mar 2022 18:20:58 +0000 Subject: [PATCH] Bug 1757830 - Land strings and assets for ECO Global Rollout H1 2022 r=pdahiya,flod Convert 100% en-* rollout strings to fluent and expose for testing. Differential Revision: https://phabricator.services.mozilla.com/D140114 --- .../data/content/assets/remote/mountain.svg | 12 +++ .../data/content/assets/remote/umbrella.png | Bin 0 -> 4292 bytes browser/components/newtab/jar.mn | 3 - .../newtab/lib/PanelTestProvider.jsm | 102 ++++++++++++++++++ .../unit/asrouter/PanelTestProvider.test.js | 2 +- .../locales/en-US/browser/newtab/asrouter.ftl | 12 +++ 6 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 browser/components/newtab/data/content/assets/remote/mountain.svg create mode 100644 browser/components/newtab/data/content/assets/remote/umbrella.png diff --git a/browser/components/newtab/data/content/assets/remote/mountain.svg b/browser/components/newtab/data/content/assets/remote/mountain.svg new file mode 100644 index 000000000000..451114882073 --- /dev/null +++ b/browser/components/newtab/data/content/assets/remote/mountain.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/browser/components/newtab/data/content/assets/remote/umbrella.png b/browser/components/newtab/data/content/assets/remote/umbrella.png new file mode 100644 index 0000000000000000000000000000000000000000..3488d135c6096e1f378b324202e4100f487b2922 GIT binary patch literal 4292 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 [ frequency: { lifetime: 3 }, trigger: { id: "defaultBrowserCheck" }, }, + { + id: "BETTER_INTERNET_GLOBAL_ROLLOUT", + groups: ["eco"], + content: { + template: "logo-and-content", + logo: { + imageURL: + "chrome://activity-stream/content/data/content/assets/remote/mountain.svg", + size: "115px", + }, + body: { + title: { + label: { + string_id: "spotlight-better-internet-header", + }, + size: "24px", + }, + text: { + label: { + string_id: "spotlight-better-internet-body", + }, + size: "16px", + }, + primary: { + label: { + string_id: "spotlight-pin-primary-button", + }, + action: { + type: "PIN_FIREFOX_TO_TASKBAR", + }, + }, + secondary: { + label: { + string_id: "spotlight-pin-secondary-button", + }, + action: { + type: "CANCEL", + }, + }, + }, + }, + trigger: { + id: "defaultBrowserCheck", + }, + template: "spotlight", + frequency: { + lifetime: 1, + }, + targeting: + "userMonthlyActivity|length >= 1 && userMonthlyActivity|length <= 6 && doesAppNeedPin", + }, + { + id: "PEACE_OF_MIND_GLOBAL_ROLLOUT", + groups: ["eco"], + content: { + template: "logo-and-content", + logo: { + imageURL: + "chrome://activity-stream/content/data/content/assets/remote/umbrella.png", + size: "115px", + }, + body: { + title: { + label: { + string_id: "spotlight-peace-mind-header", + }, + size: "24px", + }, + text: { + label: { + string_id: "spotlight-peace-mind-body", + }, + size: "16px", + }, + primary: { + label: { + string_id: "spotlight-pin-primary-button", + }, + action: { + type: "PIN_FIREFOX_TO_TASKBAR", + }, + }, + secondary: { + label: { + string_id: "spotlight-pin-secondary-button", + }, + action: { + type: "CANCEL", + }, + }, + }, + }, + trigger: { + id: "defaultBrowserCheck", + }, + template: "spotlight", + frequency: { + lifetime: 1, + }, + targeting: + "userMonthlyActivity|length >= 7 && userMonthlyActivity|length <= 13 && doesAppNeedPin", + }, { id: "MULTISTAGE_SPOTLIGHT_MESSAGE", groups: ["panel-test-provider"], diff --git a/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js b/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js index 850e9b0ad286..f8a65db5cd38 100644 --- a/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js +++ b/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js @@ -12,7 +12,7 @@ describe("PanelTestProvider", () => { it("should have correct number of messages", () => { // Careful: when changing this number make sure that new messages also go // through schema verifications. - assert.lengthOf(messages, 13); + assert.lengthOf(messages, 15); }); it("should be a valid message", () => { const updateMessages = messages.filter( diff --git a/browser/locales/en-US/browser/newtab/asrouter.ftl b/browser/locales/en-US/browser/newtab/asrouter.ftl index ad97203b25e0..004926ce4f45 100644 --- a/browser/locales/en-US/browser/newtab/asrouter.ftl +++ b/browser/locales/en-US/browser/newtab/asrouter.ftl @@ -164,3 +164,15 @@ spotlight-total-cookie-protection-body = Total Cookie Protection stops trackers spotlight-total-cookie-protection-expanded = { -brand-short-name } builds a fence around cookies, limiting them to the site you’re on so trackers can’t use them to follow you. With early access, you’ll help optimize this feature so we can keep building a better web for everyone. spotlight-total-cookie-protection-primary-button = Turn on Total Cookie Protection spotlight-total-cookie-protection-secondary-button = Not now + +## Emotive Continuous Onboarding + +spotlight-better-internet-header = A better internet starts with you +spotlight-better-internet-body = When you use { -brand-short-name}, you’re voting for an open and accessible internet that’s better for everyone. +spotlight-peace-mind-header = We’ve got you covered +spotlight-peace-mind-body = Every month, { -brand-short-name } blocks an average of over 3,000 trackers per user. Because nothing, especially privacy nuisances like trackers, should stand between you and the good internet. +spotlight-pin-primary-button = { PLATFORM() -> + [macos] Keep in Dock + *[other] Pin to taskbar +} +spotlight-pin-secondary-button = Not now