From ca35ebf1e9dc461bf242600361f6eebf458d2e9e Mon Sep 17 00:00:00 2001 From: leuryr Date: Tue, 27 Oct 2020 16:44:27 -0400 Subject: [PATCH 1/3] Change user-facing purple box to tracker tally --- _locales/en/messages.json | 18 +++++++++--------- app/content-scripts/purplebox.js | 4 ++-- app/panel/components/Settings/Purplebox.jsx | 8 ++++---- app/panel/components/Settings/SettingsMenu.jsx | 2 +- app/scss/purplebox.scss | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e56b49be7..73800306f 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -191,10 +191,10 @@ } }, "box_hide": { - "message": "Hide Box" + "message": "Hide Tally" }, "box_hide_expanded": { - "message": "Hide Purple Box" + "message": "Hide Tracker-Tally" }, "box_looking": { "message": "Looking" @@ -821,8 +821,8 @@ "settings_adblocker_list_3": { "message": "Ads + Trackers + Annoyances" }, - "settings_purple_box": { - "message": "Purple Box" + "settings_tracker_tally": { + "message": "Tracker-Tally" }, "settings_notifications": { "message": "Notifications" @@ -881,8 +881,8 @@ "settings_block_trackers": { "message": "Block new trackers added to Ghostery by default" }, - "settings_show_purple_box": { - "message": "Show the purple box in the corner of my browser" + "settings_show_tracker_tally": { + "message": "Show the tracker-tally in the corner of my browser" }, "settings_dismiss_after": { "message": "Dismiss After" @@ -909,7 +909,7 @@ "message": "secs" }, "settings_hide_alert_trusted": { - "message": "Hide the purple box on trusted websites" + "message": "Hide the tracker-tally on trusted websites" }, "settings_notify_me": { "message": "Notify me when Ghostery:" @@ -1025,8 +1025,8 @@ "settings_allow_trackers_tooltip": { "message": "For example, blocking a Facebook tracker on facebook.com might break the site." }, - "settings_show_purple_box_tooltip": { - "message": "The purple box is a real-time list of trackers that is displayed in the corner of your browser. This feature will help you see trackers as they are added onto a webpage." + "settings_show_tracker_tally_tooltip": { + "message": "The tracker-tally is a list in the corner of your browser that displays trackers as they load in real-time." }, "settings_notify_me_tooltip": { "message": "Allow Ghostery to show messages in my browser related to new product features, updates, and customer feedback." diff --git a/app/content-scripts/purplebox.js b/app/content-scripts/purplebox.js index 01f9d2743..0d1eb3b82 100644 --- a/app/content-scripts/purplebox.js +++ b/app/content-scripts/purplebox.js @@ -448,10 +448,10 @@ const Ghostery = (function(win, doc) { const style = createEl('style'); - style.textContent = '@media print {#ghostery-purple-box {display:none !important}}'; + style.textContent = '@media print {#ghostery-tracker-tally {display:none !important}}'; appendChild(doc.getElementsByTagName('head')[0], style); - ghostery.id = 'ghostery-purple-box'; + ghostery.id = 'ghostery-tracker-tally'; ghostery.className = 'ghostery-bottom ghostery-right ghostery-none'; box.id = 'ghostery-box'; count.id = 'ghostery-count'; diff --git a/app/panel/components/Settings/Purplebox.jsx b/app/panel/components/Settings/Purplebox.jsx index a1b6c1a7b..a5d248a09 100644 --- a/app/panel/components/Settings/Purplebox.jsx +++ b/app/panel/components/Settings/Purplebox.jsx @@ -21,12 +21,12 @@ const Purplebox = ({ settingsData, toggleCheckbox, selectItem }) => (
-

{ t('settings_purple_box') }

+

{ t('settings_tracker_tally') }

- - -
+ + +
diff --git a/app/panel/components/Settings/SettingsMenu.jsx b/app/panel/components/Settings/SettingsMenu.jsx index da041584d..4deadf884 100644 --- a/app/panel/components/Settings/SettingsMenu.jsx +++ b/app/panel/components/Settings/SettingsMenu.jsx @@ -64,7 +64,7 @@ const SettingsMenu = ({ is_expanded }) => {
  • - { t('settings_purple_box') } + { t('settings_tracker_tally') }
  • diff --git a/app/scss/purplebox.scss b/app/scss/purplebox.scss index 90b86671e..5c39b17e8 100644 --- a/app/scss/purplebox.scss +++ b/app/scss/purplebox.scss @@ -14,7 +14,7 @@ @import './partials/_placeholders'; @import './partials/_mixins'; -#ghostery-purple-box { +#ghostery-tracker-tally { @extend %reset; @extend %noselect; font-family: "Open Sans", "Roboto", Arial, Helvetica, sans-serif !important; From 9e0f9c1bc5e264515c9c3938a50e8bbeb1e72d25 Mon Sep 17 00:00:00 2001 From: leuryr Date: Tue, 27 Oct 2020 17:21:47 -0400 Subject: [PATCH 2/3] Remove strings that were no longer being used --- _locales/en/messages.json | 6 ------ src/classes/PurpleBox.js | 2 -- 2 files changed, 8 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 73800306f..00d1736f3 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -190,12 +190,6 @@ } } }, - "box_hide": { - "message": "Hide Tally" - }, - "box_hide_expanded": { - "message": "Hide Tracker-Tally" - }, "box_looking": { "message": "Looking" }, diff --git a/src/classes/PurpleBox.js b/src/classes/PurpleBox.js index 8d0c76a54..fc571db4a 100644 --- a/src/classes/PurpleBox.js +++ b/src/classes/PurpleBox.js @@ -68,10 +68,8 @@ class PurpleBox { box_warning_slow: t('box_warning_slow'), box_warning_nonsecure: t('box_warning_nonsecure'), tracker: t('box_tracker'), - hide: t('box_hide'), settings: t('box_settings'), options_expanded: t('box_options_expanded'), - hide_expanded: t('box_hide_expanded'), settings_expanded: t('box_settings_expanded'), box_dismiss_0s: t('box_dismiss_0s'), box_dismiss_5s: t('box_dismiss_5s'), From 077b96b79d1d61cc2602e0db3bc6207eeb69fbed Mon Sep 17 00:00:00 2001 From: leuryr Date: Wed, 28 Oct 2020 09:58:02 -0400 Subject: [PATCH 3/3] Revert key names changes --- _locales/en/messages.json | 6 +++--- app/panel/components/Settings/Purplebox.jsx | 6 +++--- app/panel/components/Settings/SettingsMenu.jsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 00d1736f3..62869651c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -815,7 +815,7 @@ "settings_adblocker_list_3": { "message": "Ads + Trackers + Annoyances" }, - "settings_tracker_tally": { + "settings_purple_box": { "message": "Tracker-Tally" }, "settings_notifications": { @@ -875,7 +875,7 @@ "settings_block_trackers": { "message": "Block new trackers added to Ghostery by default" }, - "settings_show_tracker_tally": { + "settings_show_purple_box": { "message": "Show the tracker-tally in the corner of my browser" }, "settings_dismiss_after": { @@ -1019,7 +1019,7 @@ "settings_allow_trackers_tooltip": { "message": "For example, blocking a Facebook tracker on facebook.com might break the site." }, - "settings_show_tracker_tally_tooltip": { + "settings_show_purple_box_tooltip": { "message": "The tracker-tally is a list in the corner of your browser that displays trackers as they load in real-time." }, "settings_notify_me_tooltip": { diff --git a/app/panel/components/Settings/Purplebox.jsx b/app/panel/components/Settings/Purplebox.jsx index a5d248a09..d712239f0 100644 --- a/app/panel/components/Settings/Purplebox.jsx +++ b/app/panel/components/Settings/Purplebox.jsx @@ -21,12 +21,12 @@ const Purplebox = ({ settingsData, toggleCheckbox, selectItem }) => (
    -

    { t('settings_tracker_tally') }

    +

    { t('settings_purple_box') }

    - -
    + +
    diff --git a/app/panel/components/Settings/SettingsMenu.jsx b/app/panel/components/Settings/SettingsMenu.jsx index 4deadf884..da041584d 100644 --- a/app/panel/components/Settings/SettingsMenu.jsx +++ b/app/panel/components/Settings/SettingsMenu.jsx @@ -64,7 +64,7 @@ const SettingsMenu = ({ is_expanded }) => {
  • - { t('settings_tracker_tally') } + { t('settings_purple_box') }