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

Revert key names changes

  • Loading branch information
leuryr committed Oct 28, 2020
commit 077b96b79d1d61cc2602e0db3bc6207eeb69fbed
@@ -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": {
@@ -21,12 +21,12 @@ const Purplebox = ({ settingsData, toggleCheckbox, selectItem }) => (
<div className="s-tabs-panel">
<div className="row">
<div className="columns">
<h3>{ t('settings_tracker_tally') }</h3>
<h3>{ t('settings_purple_box') }</h3>
<div className="s-option-group">
<div className="s-square-checkbox">
<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')}>
<label htmlFor="settings-show-tracker-tally"><span>{ t('settings_show_purple_box') }</span></label>
<div className="s-tooltip-down" data-g-tooltip={t('settings_show_purple_box_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_tracker_tally') }</span>
<span>{ t('settings_purple_box') }</span>
</NavLink>
</li>
<li className="s-tabs-title">
ProTip! Use n and p to navigate between commits in a pull request.