Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2191: Update purple box text to tracker tally #627

Merged
merged 4 commits into from Oct 28, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next

Change user-facing purple box to tracker tally

  • Loading branch information
leuryr committed Oct 27, 2020
commit ca35ebf1e9dc461bf242600361f6eebf458d2e9e
@@ -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": {
This conversation was marked as resolved by christophertino

This comment has been minimized.

@christophertino

christophertino Oct 28, 2020
Member

Let's not change the key names. It helps preserve the translation history in transifex.

This comment has been minimized.

@leuryr

leuryr Oct 28, 2020
Author Contributor

Ah ok, sorry, I think you did mention this yesterday. Should I revert the change I made to the element id name settings-show-purple-box as well?

This comment has been minimized.

@christophertino

christophertino Oct 28, 2020
Member

You don't need to revert the html/css ids. Just the i18n keys.

"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."
@@ -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';
@@ -21,12 +21,12 @@ const Purplebox = ({ settingsData, toggleCheckbox, selectItem }) => (
<div className="s-tabs-panel">
<div className="row">
<div className="columns">
<h3>{ t('settings_purple_box') }</h3>
<h3>{ t('settings_tracker_tally') }</h3>
<div className="s-option-group">
<div className="s-square-checkbox">
<input type="checkbox" id="settings-show-purple-box" name="show_alert" defaultChecked={settingsData.show_alert} onClick={toggleCheckbox} />
<label htmlFor="settings-show-purple-box"><span>{ t('settings_show_purple_box') }</span></label>
<div className="s-tooltip-down" data-g-tooltip={t('settings_show_purple_box_tooltip')}>
<input type="checkbox" id="settings-show-tracker-tally" name="show_alert" defaultChecked={settingsData.show_alert} onClick={toggleCheckbox} />
<label htmlFor="settings-show-tracker-tally"><span>{ t('settings_show_tracker_tally') }</span></label>
<div className="s-tooltip-down" data-g-tooltip={t('settings_show_tracker_tally_tooltip')}>
<img src="../../app/images/panel/icon-information-tooltip.svg" className="s-question" />
</div>
</div>
@@ -64,7 +64,7 @@ const SettingsMenu = ({ is_expanded }) => {
</li>
<li className="s-tabs-title">
<NavLink to="/settings/purplebox">
<span>{ t('settings_purple_box') }</span>
<span>{ t('settings_tracker_tally') }</span>
</NavLink>
</li>
<li className="s-tabs-title">
@@ -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;
ProTip! Use n and p to navigate between commits in a pull request.