Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit a94dc20

Browse files
committed
Clarify Flash usage instructions in about:preferences
fix #4754 Auditors: @alexwykoff Test Plan: go to about:preferences#security, scroll to the Flash switch. you should see a message linking to the Flash troubleshooting wiki.
1 parent c16baaa commit a94dc20

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

app/extensions/brave/locales/en-US/preferences.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,9 @@ usePDFJS=Enable HTML5 PDF reader (requires browser restart)
154154
enableFlash=Enable Adobe Flash support (requires browser restart)
155155
widevineSection=Google Widevine Support
156156
enableWidevine=Enable Google Widevine support
157-
enableFlashSubtext=Flash support is experimental and requires Pepper Flash to be installed from
158-
enableFlashSubtextLinux=Flash support is experimental and requires the pepperflashplugin-nonfree package.
157+
enableFlashSubtext=Brave uses a special version of Pepper Flash which must be installed from
158+
enableFlashSubtextLinux=Flash support requires the pepperflashplugin-nonfree Linux package.
159+
flashTroubleshooting=Flash not working? Try the troubleshooting tips on our
159160
managePasswords=Manage passwords…
160161
sitePermissions=Saved Site Permissions
161162
sitePermissionsExceptions=Saved Site Exceptions

js/about/preferences.js

+7
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,13 @@ class SecurityTab extends ImmutableComponent {
15781578
}, true)}>{'Adobe'}</span>.</span>
15791579
: <span data-l10n-id='enableFlashSubtextLinux' />
15801580
}
1581+
<div>
1582+
<span className='fa fa-info-circle' id='flashInfoIcon' />
1583+
<span><span data-l10n-id='flashTroubleshooting' />&nbsp;
1584+
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
1585+
location: 'https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'
1586+
}, true)}>{'wiki'}</span>.</span>
1587+
</div>
15811588
</span>
15821589
</SettingsList>
15831590
{ !isLinux

0 commit comments

Comments
 (0)