Skip to content

/ ghostery-extension

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

Jump to bottom

GH-2178: Update Anti-suite names where they appear in GBE #614

Closed
wants to merge 16 commits into from
+474 −474
Closed

GH-2178: Update Anti-suite names where they appear in GBE #614

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
14c38c3
Rename anti tracking, ad blocking, smart blocking, ad block and ad bl…
benstrumeyer Oct 1, 2020
7177972
Update snapshot
benstrumeyer Oct 1, 2020
47e19e5
Update smart blocking to smart browsing in a few more places
benstrumeyer Oct 1, 2020
9ce11ae
Update snapshot
benstrumeyer Oct 1, 2020
e9bda62
Merge in develop
wlycdgr Oct 2, 2020
5da56d0
Rename all variables from smartBlock -> smartBrowse, rename PolicySma…
benstrumeyer Oct 6, 2020
c276bf6
Update snapshot
benstrumeyer Oct 6, 2020
b2a3776
Merge in develop
wlycdgr Oct 27, 2020
92133b7
Merge branch 'develop' into GH-2178
benstrumeyer Oct 27, 2020
635b330
Merge branch 'develop' into GH-2178
benstrumeyer Oct 27, 2020
7bfbe2d
Merge branch 'GH-2178' of github.com:ghostery/ghostery-extension into…
benstrumeyer Oct 27, 2020
7d86f5b
Update copy
benstrumeyer Oct 27, 2020
4afc08d
Smart Browsing -> Smart-Browsing, add a dash
benstrumeyer Oct 27, 2020
3bf1cc1
Update CHANGELOG
benstrumeyer Oct 27, 2020
b0d54a8
Update more variables (smartBrowseBlocked/smartBrowseUnblocked)
benstrumeyer Oct 27, 2020
0166d29
Update Smart Blocking -> Smart Blocking in comments
benstrumeyer Oct 27, 2020
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next
Loading status checks…

Rename anti tracking, ad blocking, smart blocking, ad block and ad bl… 

…ock lists to their new names
  • Loading branch information
@benstrumeyer
benstrumeyer committed Oct 1, 2020
commit 14c38c31049f28972ec113a5745d3163e6a383ae
32 _locales/en/messages.json
View file
Open in desktop
@@ -675,10 +675,10 @@
"message": "Tracker is slow"
},
"panel_tracker_warning_smartblock_tooltip": {
"message": "Tracker blocked by Smart Blocking"
"message": "Tracker blocked by Smart Browsing"
},
"panel_tracker_warning_smartunblock_tooltip": {
"message": "Tracker unblocked by Smart Blocking"
"message": "Tracker unblocked by Smart Browsing"
},
"panel_tracker_block_tooltip": {
"message": "Block on all sites"
@@ -807,10 +807,10 @@
"message": "This site is already whitelisted."
},
"settings_adblocker": {
"message": "Ad Block Lists"
"message": "Ad-Block Lists"
},
"settings_adblocker_lists": {
"message": "Load the following Ad Block filter lists:"
"message": "Load the following Ad-Block filter lists:"
},
"settings_adblocker_list_1": {
"message": "Ads only"
@@ -1065,7 +1065,7 @@
"message": "Requests Modified:"
},
"requests_modified_tooltip": {
"message": "Total number of tracking requests & elements modified by Anti-Tracking and Ad Blocking"
"message": "Total number of tracking requests & elements modified by Anti-Tracking and Ad-Blocking"
},
"trackers_blocked": {
"message": "Trackers Blocked:"
@@ -1134,22 +1134,22 @@
"message": "Ghostery extension has been resumed."
},
"alert_anti_track_on": {
"message": "Enhanced Anti-Tracking ON. Personal data will be anonymized."
"message": "Anti-Tracking ON. Personal data will be anonymized."
},
"alert_anti_track_off": {
"message": "Enhanced Anti-Tracking OFF. Personal data will not be anonymized."
"message": "Anti-Tracking OFF. Personal data will not be anonymized."
},
"alert_ad_block_on": {
"message": "Enhanced Ad-Blocking ON. Advertisements will be blocked."
"message": "Ad-Blocking ON. Advertisements will be blocked."
},
"alert_ad_block_off": {
"message": "Enhanced Ad-Blocking OFF. Advertisements will not be blocked."
"message": "Ad-Blocking OFF. Advertisements will not be blocked."
},
"alert_smart_block_on": {
"message": "Smart Blocking ON. Tracker blocking will be adjusted to optimize page performance."
"message": "Smart Browsing ON. Tracker blocking will be adjusted to optimize page performance."
},
"alert_smart_block_off": {
"message": "Smart Blocking OFF. Tracker blocking will not be automatically adjusted."
"message": "Smart Browsing OFF. Tracker blocking will not be automatically adjusted."
},
"alert_reload": {
"message": "Reload to see changes."
@@ -2150,8 +2150,8 @@
"ghostery_rewards": {
"message": "ghostery rewards"
},
"enhanced_anti_tracking": {
"message": "Enhanced Anti-Tracking"
"anti_tracking": {
"message": "Anti-Tracking"
},
"panel_rewards_view__reward": {
"message": "Reward"
@@ -2461,11 +2461,11 @@
"off": {
"message": "Off"
},
"enhanced_ad_blocking": {
"message": "Enhanced Ad Blocking"
"ad_blocking": {
"message": "Ad-Blocking"
},
"smart_blocking": {
"message": "Smart Blocking"
"message": "Smart Browsing"
},
"smart_blocking_DESC": {
"message": "Automatically block and unblock trackers to optimize page performance."
6 app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss
View file
Open in desktop
@@ -63,12 +63,12 @@
background-image: buildAdBlockActiveIcon(#1dafed);
}

// Smart Blocking Icon
// Smart Browsing Icon
.SetupAntiSuite__feature .smart-blocking {

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Oct 1, 2020
Member

Let's also change the class names .smart-blocking -> .smart-browsing

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Oct 1, 2020
Author Contributor

Updated the class names!
background-image: buildSmartBlockingIcon(#9f9f9f);
background-image: buildSmartBrowsingIcon(#9f9f9f);
}
.SetupAntiSuite__feature .smart-blocking.active {
background-image: buildSmartBlockingActiveIcon(#1dafed);
background-image: buildSmartBrowsingActiveIcon(#1dafed);
}

// Ghostery Rewards Icon
4 app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx
View file
Open in desktop
@@ -107,7 +107,7 @@ class SetupAntiSuiteViewContainer extends Component {
const features = [
{
id: 'anti-tracking',
name: t('enhanced_anti_tracking'),
name: t('anti_tracking'),
enabled: anti_tracking_enabled,
locked: IS_CLIQZ,
toggle: IS_CLIQZ ?
@@ -117,7 +117,7 @@ class SetupAntiSuiteViewContainer extends Component {
},
{
id: 'ad-block',
name: t('enhanced_ad_blocking'),
name: t('ad_blocking'),
enabled: ad_block_enabled,
locked: IS_CLIQZ,
toggle: IS_CLIQZ ?
2 app/hub/Views/TutorialView/TutorialView.scss
View file
Open in desktop
@@ -250,7 +250,7 @@
background-position: left 11.5px top 4px;
}
.TutorialAntiSuiteView__key .TutorialView__keyImage.smart-block {
background-image: buildSmartBlockingIcon(#1dafed);
background-image: buildSmartBrowsingIcon(#1dafed);
background-position: left 13.5px top 2px;
}
.TutorialAntiSuiteView__key .TutorialView__keyTitle {
4 app/hub/Views/TutorialViews/TutorialAntiSuiteView/TutorialAntiSuiteView.jsx
View file
Open in desktop
@@ -53,7 +53,7 @@ const TutorialAntiSuiteView = ({ isAndroid }) => (
<div className="TutorialView__keyImage anti-track" />
<div>
<div className="TutorialView__keyTitle">
{t('enhanced_anti_tracking')}
{t('anti_tracking')}
</div>
<div className="TutorialView__keyText">
{t('hub_tutorial_antisuite_antitracking_description')}
@@ -64,7 +64,7 @@ const TutorialAntiSuiteView = ({ isAndroid }) => (
<div className="TutorialView__keyImage ad-block" />
<div>
<div className="TutorialView__keyTitle">
{t('enhanced_ad_blocking')}
{t('ad_blocking')}
</div>
<div className="TutorialView__keyText">
{t('ad_blocking_DESC')}
8 app/panel/components/BuildingBlocks/CliqzFeature.jsx
View file
Open in desktop
@@ -64,9 +64,9 @@ class CliqzFeature extends React.Component {

switch (type) {
case 'ad_block':
return t('enhanced_ad_blocking');
return t('ad_blocking');
case 'anti_track':
return t('enhanced_anti_tracking');
return t('anti_tracking');
case 'smart_block':
This conversation was marked as resolved by wlycdgr

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Oct 1, 2020
Member

Update the names here too

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Oct 1, 2020
Author Contributor

Updated!
return t('smart_blocking');
default:
@@ -137,9 +137,9 @@ class CliqzFeature extends React.Component {
const featureType = type === 'anti_track' ? 'anti_tracking' : type;
let featureName;
if (featureType === 'anti_tracking') {
featureName = t('enhanced_anti_tracking');
featureName = t('anti_tracking');
} else if (featureType === 'ad_block') {
featureName = t('enhanced_ad_blocking');
featureName = t('ad_blocking');
} else if (featureType === 'smart_block') {
featureName = t('smart_blocking');
}
Comment on lines 143 to 145

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Oct 1, 2020
Member

And here

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Oct 1, 2020
Author Contributor

Updated!
4 app/scss/partials/_hub_svgs.scss
View file
Open in desktop
@@ -101,10 +101,10 @@
@function buildAdBlockActiveIcon($primary-color) {
@return url('data:image/svg+xml;charset%3dUS-ASCII,%3Csvg%20width%3D%2223%22%20height%3D%2232%22%20xmlns%3D%22http://www.w3.org/2000/svg%22%3E%3Cg%20transform%3D%22translate(1.12%20.56)%22%20fill%3D%22#{_url-friendly-color($primary-color)}%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M4.525%2026.57c.713.714%201.423%201.429%202.14%202.137.052.052.153.08.233.08%202.443.003%204.885.004%207.327-.002a.42.42%200%200%200%20.265-.109c1.73-1.723%203.457-3.45%205.181-5.181a.418.418%200%200%200%20.114-.263c.007-2.45.006-4.9.004-7.35-.002-.067-.017-.154-.059-.199-.717-.728-1.439-1.45-2.152-2.167L4.525%2026.57m-.99-.982l13.05-13.051c-.7-.7-1.409-1.413-2.126-2.122a.36.36%200%200%200-.231-.081%201608.44%201608.44%200%200%200-7.327.001.414.414%200%200%200-.267.106%201715.804%201715.804%200%200%200-5.197%205.195.362.362%200%200%200-.102.225c-.005%202.465-.005%204.93-.001%207.393%200%20.067.025.15.07.194.712.722%201.43%201.439%202.13%202.14m17.582-6.014c0%201.317-.005%202.634.004%203.95a.92.92%200%200%201-.288.707%201994.487%201994.487%200%200%200-5.603%205.601.903.903%200%200%201-.685.288c-2.654-.006-5.31-.006-7.966%200a.909.909%200%200%201-.685-.286c-1.868-1.875-3.74-3.748-5.617-5.617A.872.872%200%200%201%200%2023.55C.006%2020.895.006%2018.24%200%2015.583c0-.277.084-.49.28-.686%201.877-1.87%203.75-3.741%205.62-5.618A.88.88%200%200%201%206.562%209c2.663.005%205.326.005%207.989%200%20.27%200%20.477.087.665.277%201.875%201.881%203.754%203.758%205.635%205.633.183.183.27.386.268.647-.007%201.339-.004%202.678-.004%204.017%22%20stroke%3D%22#{_url-friendly-color($primary-color)}%22/%3E%3Ccircle%20cx%3D%2210.92%22%20cy%3D%221.92%22%20r%3D%221.92%22/%3E%3C/g%3E%3C/svg%3E');
}
@function buildSmartBlockingIcon($primary-color) { // Also used in Tutorial Anti Suite View
@function buildSmartBrowsingIcon($primary-color) { // Also used in Tutorial Anti Suite View
@return url('data:image/svg+xml;charset%3dUS-ASCII,%3Csvg%20width%3D%2218%22%20height%3D%2236%22%20xmlns%3D%22http://www.w3.org/2000/svg%22%3E%3Cg%20transform%3D%22translate(.04%20.32)%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M15.338%2017.571c-.093%201.622-.669%203.052-1.588%204.364-.413.591-.832%201.177-1.233%201.779-.573.858-1.032%201.77-1.208%202.801-.03.17-.136.157-.253.157l-2.424-.001c-.798%200-1.597-.005-2.396.003-.175.002-.237-.048-.272-.23-.19-.997-.632-1.889-1.192-2.724-.477-.709-.974-1.405-1.453-2.114a8.02%208.02%200%200%201-1.388-4.265c-.108-2.725%201.427-5.103%204.017-6.207%203.32-1.413%207.245.005%208.8%203.185.5%201.026.654%202.116.59%203.252zM6.098%2029.23h5.092v-.61H6.098v.61zm4.569%202.592H6.62c-.488%200-.577-.104-.514-.631h5.069c.07.519-.022.63-.508.63zm5.99-17.957c-1.392-3.063-3.808-4.764-7.091-5.157-2.796-.336-5.228.589-7.21%202.584C.143%2013.52-.388%2016.245.254%2019.258c.337%201.575%201.103%202.945%202.02%204.243.42.597.833%201.202%201.22%201.82.356.574.61%201.2.634%201.882.03.786.008%201.573.008%202.36h.03c0%20.653%200%201.306.002%201.959.006%201.164.914%202.147%202.065%202.223.15.01.202.054.239.207a2.232%202.232%200%200%200%202.16%201.732c1.042.001%201.928-.698%202.183-1.738.033-.136.07-.189.216-.2a2.245%202.245%200%200%200%202.088-2.258c0-1.216.01-2.432-.003-3.65-.011-.909.199-1.755.678-2.523.386-.619.798-1.225%201.222-1.817%201.212-1.698%202.07-3.531%202.23-5.649.105-1.376-.017-2.722-.59-3.984z%22%20fill%3D%22#{_url-friendly-color($primary-color)}%22/%3E%3Cpath%20d%3D%22M8.732%2015.614a.31.31%200%200%200-.184%200L4.596%2016.67a.356.356%200%200%200-.276.351c.018%202.834%201.526%205.464%204.118%207.223a.37.37%200%200%200%20.202.056.37.37%200%200%200%20.202-.056c2.592-1.76%204.1-4.389%204.118-7.223a.356.356%200%200%200-.276-.351l-3.952-1.056z%22%20stroke%3D%22#{_url-friendly-color($primary-color)}%22%20stroke-width%3D%221.44%22/%3E%3C/g%3E%3C/svg%3E');
}
@function buildSmartBlockingActiveIcon($primary-color) {
@function buildSmartBrowsingActiveIcon($primary-color) {
@return url('data:image/svg+xml;charset%3dUS-ASCII,%3Csvg%20width%3D%2218%22%20height%3D%2236%22%20xmlns%3D%22http://www.w3.org/2000/svg%22%3E%3Cg%20transform%3D%22translate(.04%20.32)%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M15.338%2017.571c-.093%201.622-.669%203.052-1.588%204.364-.413.591-.832%201.177-1.233%201.779-.573.858-1.032%201.77-1.208%202.801-.03.17-.136.157-.253.157l-2.424-.001c-.798%200-1.597-.005-2.396.003-.175.002-.237-.048-.272-.23-.19-.997-.632-1.889-1.192-2.724-.477-.709-.974-1.405-1.453-2.114a8.02%208.02%200%200%201-1.388-4.265c-.108-2.725%201.427-5.103%204.017-6.207%203.32-1.413%207.245.005%208.8%203.185.5%201.026.654%202.116.59%203.252zM6.098%2029.23h5.092v-.61H6.098v.61zm4.569%202.592H6.62c-.488%200-.577-.104-.514-.631h5.069c.07.519-.022.63-.508.63zm5.99-17.957c-1.392-3.063-3.808-4.764-7.091-5.157-2.796-.336-5.228.589-7.21%202.584C.143%2013.52-.388%2016.245.254%2019.258c.337%201.575%201.103%202.945%202.02%204.243.42.597.833%201.202%201.22%201.82.356.574.61%201.2.634%201.882.03.786.008%201.573.008%202.36h.03c0%20.653%200%201.306.002%201.959.006%201.164.914%202.147%202.065%202.223.15.01.202.054.239.207a2.232%202.232%200%200%200%202.16%201.732c1.042.001%201.928-.698%202.183-1.738.033-.136.07-.189.216-.2a2.245%202.245%200%200%200%202.088-2.258c0-1.216.01-2.432-.003-3.65-.011-.909.199-1.755.678-2.523.386-.619.798-1.225%201.222-1.817%201.212-1.698%202.07-3.531%202.23-5.649.105-1.376-.017-2.722-.59-3.984z%22%20fill%3D%22#{_url-friendly-color($primary-color)}%22/%3E%3Cpath%20d%3D%22M8.732%2015.614a.31.31%200%200%200-.184%200L4.596%2016.67a.356.356%200%200%200-.276.351c.018%202.834%201.526%205.464%204.118%207.223a.37.37%200%200%200%20.202.056.37.37%200%200%200%20.202-.056c2.592-1.76%204.1-4.389%204.118-7.223a.356.356%200%200%200-.276-.351l-3.952-1.056z%22%20stroke%3D%22#{_url-friendly-color($primary-color)}%22%20stroke-width%3D%221.44%22/%3E%3Ccircle%20fill%3D%22#{_url-friendly-color($primary-color)}%22%20cx%3D%228.92%22%20cy%3D%221.92%22%20r%3D%221.92%22/%3E%3C/g%3E%3C/svg%3E');
}
@function buildGhosteryRewardsIcon($primary-color) {
ProTip! Use n and p to navigate between commits in a pull request.