Skip to content

Commit 9f5ea00

Browse files
authored
Merge pull request #6079 from brave/pr6060_update_shields_panel_text_1.12.x
Updated shields panel readonly view option's label (uplift to 1.12.x)
2 parents 04a05a0 + 9820196 commit 9f5ea00

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

components/brave_extension/extension/brave_extension/_locales/en_US/messages.json

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
"message": "Cross-site trackers blocked",
5656
"description": "Message for the scripts blocked row label"
5757
},
58+
"readOnlyAdsTrackersBlocking": {
59+
"message": "Trackers & ads blocked",
60+
"description": "Message for the option in the ads and trackers blocking select field in read only view"
61+
},
5862
"aggressiveAdsTrackersBlocking": {
5963
"message": "Trackers & ads blocked (aggressive)",
6064
"description": "Message for the option in the ads and trackers blocking select field to block ads and trackers with aggressive heuristics"
@@ -91,6 +95,10 @@
9195
"message": "All cookies allowed",
9296
"description": "Message for the option in the cookies select field to allow all cookies"
9397
},
98+
"readOnlyFingerprinting": {
99+
"message": "Fingerprinting blocked",
100+
"description": "Message for the option in the fingerprinting field in read only view"
101+
},
94102
"standardFingerprinting": {
95103
"message": "Fingerprinting blocked (standard)",
96104
"description": "Message for the option in the fingerprinting select field to block all 3rd party recognition attempts"

components/brave_extension/extension/brave_extension/containers/readOnlyView/controls/adsTrackersControl.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default class AdsTrackersControl extends React.PureComponent<Props, State
8888
: <ArrowDownIcon />
8989
}
9090
<BlockedInfoRowStats>{this.totalAdsTrackersBlockedDisplay}</BlockedInfoRowStats>
91-
<BlockedInfoRowText>{getLocale('thirdPartyTrackersBlocked')}</BlockedInfoRowText>
91+
<BlockedInfoRowText>{getLocale('readOnlyAdsTrackersBlocking')}</BlockedInfoRowText>
9292
</BlockedInfoRowData>
9393
</BlockedInfoRowSummary>
9494
<BlockedListStatic>

components/brave_extension/extension/brave_extension/containers/readOnlyView/controls/deviceRecognitionControl.tsx

+7-9
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
ArrowUpIcon,
1111
ArrowDownIcon,
1212
BlockedInfoRowStats,
13-
BlockedInfoRowForSelectSummary,
14-
BlockedInfoRowDataForSelect,
13+
BlockedInfoRowSummary,
14+
BlockedInfoRowData,
1515
BlockedListStatic,
1616
BlockedInfoRowText
1717
} from '../../../components'
@@ -68,19 +68,17 @@ export default class DeviceRecognitionControl extends React.PureComponent<Props,
6868
const { fingerprintingBlockedResources } = this.props
6969
return (
7070
<BlockedInfoRowDetails>
71-
<BlockedInfoRowForSelectSummary onClick={this.triggerOpenDeviceRecognition}>
72-
<BlockedInfoRowDataForSelect disabled={this.shouldDisableResourcesRow}>
71+
<BlockedInfoRowSummary onClick={this.triggerOpenDeviceRecognition}>
72+
<BlockedInfoRowData disabled={this.shouldDisableResourcesRow}>
7373
{
7474
deviceRecognitionOpen
7575
? <ArrowUpIcon />
7676
: <ArrowDownIcon />
7777
}
7878
<BlockedInfoRowStats>{this.totalDeviceRecognitonAttemptsDisplay}</BlockedInfoRowStats>
79-
<BlockedInfoRowText>
80-
<span>{getLocale('thirdPartyFingerprintingBlocked')}</span>
81-
</BlockedInfoRowText>
82-
</BlockedInfoRowDataForSelect>
83-
</BlockedInfoRowForSelectSummary>
79+
<BlockedInfoRowText>{getLocale('readOnlyFingerprinting')}</BlockedInfoRowText>
80+
</BlockedInfoRowData>
81+
</BlockedInfoRowSummary>
8482
<BlockedListStatic>
8583
<StaticResourcesList list={fingerprintingBlockedResources} />
8684
</BlockedListStatic>

0 commit comments

Comments
 (0)