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
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Update smart blocking to smart browsing in a few more places

  • Loading branch information
@benstrumeyer
benstrumeyer committed Oct 1, 2020
commit 47e19e5d4b0a965496f995de5820540247dd7bf1
4 _locales/en/messages.json
View file
Open in desktop
@@ -2464,10 +2464,10 @@
"ad_blocking": {
"message": "Ad-Blocking"
},
"smart_blocking": {
"smart_browsing": {
"message": "Smart Browsing"
},
"smart_blocking_DESC": {
"smart_browsing_DESC": {
"message": "Automatically block and unblock trackers to optimize page performance."
},
"ad_blocking_DESC": {
4 app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss
View file
Open in desktop
@@ -64,10 +64,10 @@
}

// Smart Browsing Icon
.SetupAntiSuite__feature .smart-blocking {
.SetupAntiSuite__feature .smart-browsing {
background-image: buildSmartBrowsingIcon(#9f9f9f);
}
.SetupAntiSuite__feature .smart-blocking.active {
.SetupAntiSuite__feature .smart-browsing.active {
background-image: buildSmartBrowsingActiveIcon(#1dafed);
Comment on lines 66 to 71

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Oct 2, 2020
Member

Did you also update the place(s) in the components where these classes are used? Sorry if I missed that

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Oct 6, 2020
Author Contributor

My bad! Looks like it got updated by the global search and replace 👍
}

4 app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx
View file
Open in desktop
@@ -127,10 +127,10 @@ class SetupAntiSuiteViewContainer extends Component {
},
{
id: 'smart-blocking',
name: t('smart_blocking'),
name: t('smart_browsing'),
enabled: enable_smart_block,
toggle: () => this._handleToggle('smart-blocking'),
description: t('smart_blocking_DESC'),
description: t('smart_browsing_DESC'),
}
];

4 app/hub/Views/TutorialViews/TutorialAntiSuiteView/TutorialAntiSuiteView.jsx
View file
Open in desktop
@@ -75,10 +75,10 @@ const TutorialAntiSuiteView = ({ isAndroid }) => (
<div className="TutorialView__keyImage smart-block" />
<div>
<div className="TutorialView__keyTitle">
{t('smart_blocking')}
{t('smart_browsing')}
</div>
<div className="TutorialView__keyText">
{t('smart_blocking_DESC')}
{t('smart_browsing_DESC')}
</div>
</div>
</div>
6 app/panel/components/BuildingBlocks/CliqzFeature.jsx
View file
Open in desktop
@@ -52,7 +52,7 @@ class CliqzFeature extends React.Component {
case 'anti_track':
return t('anti_tracking_DESC');
case 'smart_block':
return t('smart_blocking_DESC');
return t('smart_browsing_DESC');
default:
return false;
}
@@ -68,7 +68,7 @@ class CliqzFeature extends React.Component {
case 'anti_track':
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');
return t('smart_browsing');
default:
return false;
}
@@ -141,7 +141,7 @@ class CliqzFeature extends React.Component {
} else if (featureType === 'ad_block') {
featureName = t('ad_blocking');
} else if (featureType === 'smart_block') {
featureName = t('smart_blocking');
featureName = t('smart_browsing');
}

return (
ProTip! Use n and p to navigate between commits in a pull request.