From 861034bdf42cb7d28ea48c967457d712df5dcd8b Mon Sep 17 00:00:00 2001 From: ilyazarembsky Date: Tue, 20 Aug 2019 16:30:26 -0400 Subject: [PATCH 1/4] Update Intro Hub copy to be opt-in for Rewards and HW --- _locales/en/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index c4da83e77..e0ef67b4b 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1369,7 +1369,7 @@ "message": "Sign In" }, "hub_side_navigation_log_out": { - "message": "Sign Out" + "message": "Sign Out" }, "hub_home_page_title": { "message": "Ghostery Hub - Home" @@ -1387,7 +1387,7 @@ "message": "Share additional anonymous analytics data to improve Ghostery’s performance." }, "hub_home_header_info": { - "message": "New users are opted in to participating in Human Web and Ghostery Rewards. You may change these settings in custom setup or in the extension. " + "message": "New users are opted out of participating in Ghostery Rewards and Human Web by default. You may opt in to these recommended features in custom setup or in the extension. " }, "hub_home_header_info_link": { "message": "Learn More." From a97445c35dec6eebe835988fa37fc06bb435274c Mon Sep 17 00:00:00 2001 From: ilyazarembsky Date: Tue, 20 Aug 2019 17:15:09 -0400 Subject: [PATCH 2/4] Only show opt in copy if user is using Firefox --- _locales/en/messages.json | 5 ++++- app/hub/Views/HomeView/HomeView.jsx | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e0ef67b4b..9335b9cf9 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1386,9 +1386,12 @@ "hub_home_header_checkbox_label": { "message": "Share additional anonymous analytics data to improve Ghostery’s performance." }, - "hub_home_header_info": { + "hub_home_header_info_opt_in": { "message": "New users are opted out of participating in Ghostery Rewards and Human Web by default. You may opt in to these recommended features in custom setup or in the extension. " }, + "hub_home_header_info": { + "message": "New users are opted in to participating in Human Web and Ghostery Rewards. You may change these settings in custom setup or in the extension. " + }, "hub_home_header_info_link": { "message": "Learn More." }, diff --git a/app/hub/Views/HomeView/HomeView.jsx b/app/hub/Views/HomeView/HomeView.jsx index 80f35a195..6864a6f7c 100644 --- a/app/hub/Views/HomeView/HomeView.jsx +++ b/app/hub/Views/HomeView/HomeView.jsx @@ -34,6 +34,9 @@ const HomeView = (props) => { isPlus, } = props; const accountHref = `https://account.${globals.GHOSTERY_DOMAIN}.com`; + const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name && globals.BROWSER_INFO.name === 'firefox') + ? t('hub_home_header_info_opt_in') + : t('hub_home_header_info'); const tutorialFeatureClassNames = ClassNames('HomeView__onboardingFeature columns flex-container align-middle flex-dir-column', { 'feature-tutorial-complete': tutorial_complete, 'feature-tutorial': !tutorial_complete, @@ -68,7 +71,7 @@ const HomeView = (props) => {
- {t('hub_home_header_info')} + {headerInfoText} {t('hub_home_header_info_link')} From 8ddb2408b83f1b006245b20476692049ccea4282 Mon Sep 17 00:00:00 2001 From: ilyazarembsky Date: Tue, 20 Aug 2019 18:24:18 -0400 Subject: [PATCH 3/4] Update home header info opted out string key. Simplify headerInfoText logic in HomeView --- _locales/en/messages.json | 2 +- app/hub/Views/HomeView/HomeView.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 9335b9cf9..b624b58a7 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1386,7 +1386,7 @@ "hub_home_header_checkbox_label": { "message": "Share additional anonymous analytics data to improve Ghostery’s performance." }, - "hub_home_header_info_opt_in": { + "hub_home_header_info_opted_out": { "message": "New users are opted out of participating in Ghostery Rewards and Human Web by default. You may opt in to these recommended features in custom setup or in the extension. " }, "hub_home_header_info": { diff --git a/app/hub/Views/HomeView/HomeView.jsx b/app/hub/Views/HomeView/HomeView.jsx index 6864a6f7c..1307bf9d6 100644 --- a/app/hub/Views/HomeView/HomeView.jsx +++ b/app/hub/Views/HomeView/HomeView.jsx @@ -34,8 +34,8 @@ const HomeView = (props) => { isPlus, } = props; const accountHref = `https://account.${globals.GHOSTERY_DOMAIN}.com`; - const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name && globals.BROWSER_INFO.name === 'firefox') - ? t('hub_home_header_info_opt_in') + const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name === 'firefox') + ? t('hub_home_header_info_opted_out') : t('hub_home_header_info'); const tutorialFeatureClassNames = ClassNames('HomeView__onboardingFeature columns flex-container align-middle flex-dir-column', { 'feature-tutorial-complete': tutorial_complete, From 720ea2db5800e1b3f286c45aef357b078b5a7ec7 Mon Sep 17 00:00:00 2001 From: ilyazarembsky Date: Tue, 20 Aug 2019 18:35:22 -0400 Subject: [PATCH 4/4] Pacify linter re: tabs vs spaces. Remove extra space in messages --- _locales/en/messages.json | 2 +- app/hub/Views/HomeView/HomeView.jsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index b624b58a7..c7a13ae10 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1369,7 +1369,7 @@ "message": "Sign In" }, "hub_side_navigation_log_out": { - "message": "Sign Out" + "message": "Sign Out" }, "hub_home_page_title": { "message": "Ghostery Hub - Home" diff --git a/app/hub/Views/HomeView/HomeView.jsx b/app/hub/Views/HomeView/HomeView.jsx index 1307bf9d6..7369d40a6 100644 --- a/app/hub/Views/HomeView/HomeView.jsx +++ b/app/hub/Views/HomeView/HomeView.jsx @@ -34,9 +34,9 @@ const HomeView = (props) => { isPlus, } = props; const accountHref = `https://account.${globals.GHOSTERY_DOMAIN}.com`; - const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name === 'firefox') - ? t('hub_home_header_info_opted_out') - : t('hub_home_header_info'); + const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name === 'firefox') + ? t('hub_home_header_info_opted_out') + : t('hub_home_header_info'); const tutorialFeatureClassNames = ClassNames('HomeView__onboardingFeature columns flex-container align-middle flex-dir-column', { 'feature-tutorial-complete': tutorial_complete, 'feature-tutorial': !tutorial_complete,