nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Update description for bridge options

Browse Source 
- Mention that this option is for preventing censorship.

- Simplify description of upstream bridges.

- Give hyperlink to bridges.torproject.org.

- Make it slightly more clear that users can copy paste information from
  bridges page.

- Update list of supported transports.
This commit is contained in:
Sunil Mohan Adapa 2017-01-29 10:50:00 +05:30
parent 4162c2df86
commit c311175797
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plinth/modules/tor/forms.py
View File

@ -84,19 +84,21 @@ class TorForm(forms.Form): # pylint: disable=W0232
use_upstream_bridges = forms.BooleanField( use_upstream_bridges = forms.BooleanField(
label=_('Use upstream bridges to connect to Tor network'), label=_('Use upstream bridges to connect to Tor network'),
required=False, required=False,
help_text=_('When enabled, the bridges configured below will be used ' help_text=_(
'to connect to the Tor network. This will disable relay ' 'When enabled, the bridges configured below will be used to '
'modes. Only use this option if you cannot connect to ' 'connect to the Tor network. Use this option if your Internet '
'the Tor network directly.')) 'Service Provider (ISP) blocks or censors connections to the '
'Tor Network. This will disable relay modes.'))
upstream_bridges = TrimmedCharField( upstream_bridges = TrimmedCharField(
widget=widgets.Textarea, widget=widgets.Textarea,
label=_('Upstream bridges'), label=_('Upstream bridges'),
required=False, required=False,
help_text=_('If you need to use a bridge to connect to Tor network, ' help_text=_(
'you can get some bridges from ' 'You can get some bridges from <a '
'https://bridges.torproject.org/ and paste the bridge ' 'href="https://bridges.torproject.org/">'
'information here. Note: If you need to use a pluggable ' 'https://bridges.torproject.org/</a> and copy/paste the bridge '
'transport, only obfs4 is supported currently.'), 'information here. Currently supported transports are none, '
'obfs3, obfs4 and scamblesuit.'),
validators=[bridges_validator]) validators=[bridges_validator])
relay_enabled = forms.BooleanField( relay_enabled = forms.BooleanField(
label=_('Enable Tor relay'), label=_('Enable Tor relay'),