May 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Remove unused unittest lib/bridgedb/test/bridgedb.conf file.
by isis＠torproject.org 16 May '14

16 May '14

commit d061571b2887f73905b8cc7749a19daa11cceab5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:31:02 2014 +0000 Remove unused unittest lib/bridgedb/test/bridgedb.conf file. --- lib/bridgedb/test/bridgedb.conf | 55 --------------------------------------- 1 file changed, 55 deletions(-) diff --git a/lib/bridgedb/test/bridgedb.conf b/lib/bridgedb/test/bridgedb.conf deleted file mode 100644 index ce12096..0000000 --- a/lib/bridgedb/test/bridgedb.conf +++ /dev/null @@ -1,55 +0,0 @@ -BRIDGE_FILES = ["bridge-descriptors"] -EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"] -STATUS_FILE = "networkstatus-bridges" -HTTPS_CERT_FILE="cert" -HTTPS_KEY_FILE="privkey.pem" -LOGFILE = "bridgedb.log" -ASSIGNMENTS_FILE = "assignments.log" -PIDFILE = "bridgedb.pid" -DB_FILE = "bridgedist.db" -DB_LOG_FILE = "bridgedist.log" -MASTER_KEY_FILE = "secret_key" -PROXY_LIST_FILES = [] -LOGLEVEL = "DEBUG" -SAFELOGGING = True -LOGFILE_COUNT = 5 -LOGFILE_ROTATE_SIZE = 10000000 -BRIDGE_PURPOSE = "bridge" -N_IP_CLUSTERS = 4 -FORCE_PORTS = [(443, 1)] -FORCE_FLAGS = [("Stable", 1)] -HTTPS_DIST = True -HTTPS_BIND_IP = '127.0.0.1' -HTTPS_PORT = 6789 -HTTPS_N_BRIDGES_PER_ANSWER = 3 -HTTPS_INCLUDE_FINGERPRINTS = True -HTTPS_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_UNENCRYPTED_BIND_IP = None -HTTP_UNENCRYPTED_PORT = None -HTTP_USE_IP_FROM_FORWARDED_HEADER = False -HTTP_N_BRIDGES_PER_ANSWER = 3 -EMAIL_DIST = True -EMAIL_FROM_ADDR = "bridges(a)torproject.org" -EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" -EMAIL_SMTP_HOST = "127.0.0.1" -EMAIL_SMTP_PORT = 25 -EMAIL_USERNAME = "bridges" -EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] -EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com"} -EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"]} -EMAIL_RESTRICT_IPS = [] -EMAIL_BIND_IP="127.0.0.1" -EMAIL_PORT=6725 -EMAIL_N_BRIDGES_PER_ANSWER=3 -EMAIL_INCLUDE_FINGERPRINTS = True -EMAIL_GPG_SIGNING_ENABLED = True -EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' -HTTPS_SHARE = 10 -EMAIL_SHARE = 10 -RESERVED_SHARE = 2 -FILE_BUCKETS = {} -RECAPTCHA_ENABLED = False -RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = ''

1 0

[bridgedb/master] Update docstrings for Bridge class.
by isis＠torproject.org 16 May '14

16 May '14

commit 2974d6982a4da41b8a5f270f8453212b3386c504 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 09:24:01 2014 +0000 Update docstrings for Bridge class. --- lib/bridgedb/Bridges.py | 50 ++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index fce9943..fdc4680 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -91,36 +91,38 @@ fromHex = binascii.a2b_hex class Bridge(object): - """Holds information for a single bridge + """Holds information for a single bridge, along with any Pluggable + Transports it is also running. :attr str nickname: The bridge's nickname. Not currently used. - :type ip: :class:`ipaddr.IPAddress` - :attr ip: The bridge's IPv4 address, specified on 'r'-line in NS + :attr ip: (:class:`ipaddr.IPAddress`) The bridge's IPv4 address, specified + on the 'r'-line in a networkstatus document. :attr int orport: The bridge's OR port. - :attr dict or_addresses: The bridges alternate IP addresses, keys - the address, values are the port(s) on - which it listens. - :attr list transports: List of PluggableTransport instances for - each PT the bridge supports. - :attr str fingerprint: The bridge's identity digest, in lowercase - hex, with no spaces. - :attr bool running: Is this bridge running? - :attr bool stable: Is this bridge stable? - :attr dict blockingCountries: list of country codes blocking this - bridge - :attr str desc_digest: SHA-1 hexdigest of the bridge's descriptor - as defined in the networkstatus document - :attr str ei_digest: SHA-1 hexdigest of the bridge's extra-info - document as defined in the bridge's - descriptor, corresponding to desc_digest - :attr bool verified: Did we receive the descriptor for this - bridge that was specified in the - networkstatus? + :attr dict or_addresses: The bridges alternate IP addresses. The keys + should be instances of ``ipaddr.IPAddress``, and the value should be a + :class:`bridgedb.parse.addr.PortList` for the port(s) on which that + address is listening. + :attr list transports: List of :class:`PluggableTransport` instances for + each PT which the bridge supports. + :attr str fingerprint: The bridge's identity digest, in lowercase hex, + without whitespace. + :attr bool running: ``True``, if this bridge was given the ``Running`` flag. + :attr bool stable: ``True``, if this bridge was given the ``Stable`` flag. + :attr dict blockingCountries: A dictionary whose keys are strings of + ``"IP:port"`` pairs, and the keys are lists of two letter country + codes which block that IP:port. For example:: + {"1.2.3.4:9001": ['sk', 'us', 'ir', 'cn']} + :attr str desc_digest: SHA1 hexdigest of the bridge's descriptor as + defined in the networkstatus document. + :attr str ei_digest: SHA1 hexdigest of the bridge's extra-info document as + given in the bridge's descriptor, corresponding to desc_digest. + :attr bool verified: Did we receive the descriptor for this bridge that + was specified in the networkstatus? """ def __init__(self, nickname, ip, orport, fingerprint=None, id_digest=None, or_addresses=None, transports=None): - """Create a new Bridge. One of fingerprint and id_digest must be - set.""" + """Create a new Bridge. One of fingerprint and id_digest must be set. + """ self.nickname = nickname self.ip = ip self.orport = orport

1 0

[bridgedb/master] Add AUTHORS file.
by isis＠torproject.org 16 May '14

16 May '14

commit 530f2b34f72d16d344cd6f1179865bc42b967dc5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 16:18:52 2014 +0000 Add AUTHORS file. --- AUTHORS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..4995534 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,19 @@ +Current core developers: + Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 + Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2 + +Past core developers: + Nick Mathewson <nickm(a)torproject.org> 0x21194EBB165733EA + Aaron Gibson <aagbsn(a)torproject.org> 0x2C4B239DD876C9F6 + Christian Fromme <kaner(a)torproject.org> 0xA922CB73CC0960D0 + +Contributors: + Roger Dingledine <arma(a)torproject.org> + Karsten Loesing <karsten(a)torproject.org> + Robert Ransom <rransom.8774(a)gmail.com> + Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> + Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> + George Kadianakis <asn(a)torproject.org> + Kostas Jakeliunas <kostas(a)jakeliunas.com> + katmagic <the.magical.kat(a)gmail.com> + ovnicraft

1 0

[bridgedb/master] Add Makefile directives for building/cleaning documentation.
by isis＠torproject.org 16 May '14

16 May '14

commit 8c3465cf02cf381fc6887b7f2194dfd4ea15dfa5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:26:25 2014 +0000 Add Makefile directives for building/cleaning documentation. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 22a231e..6e027a7 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,12 @@ reinstall: uninstall force-install translations: ./maint/get-completed-translations +docs: + python setup.py build_sphinx + +clean-docs: + -rm -rf build/sphinx + clean: -rm -rf build -rm -rf dist

1 0

[bridgedb/master] Update CHANGELOG with translations updates.
by isis＠torproject.org 16 May '14

16 May '14

commit bc52087dc68e9adbdd47a16c88dc108fc59763cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:22:31 2014 +0000 Update CHANGELOG with translations updates. --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f640282..23ddd1e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +Changes in version 0.2.1 - + * + +And includes the following general changes: + * UPDATE Italian (it) gettext file. + Thanks to Francesca Ciceri. + * ADD Welsh (cy) translations. + Thanks to huwwaters and littlegreykida. + * ADD Slovak (sk) translations. + Thanks to Michelozzo and Svistwarrior273. + Changes in version 0.2.0 - 2014-04-19 * FIXES #5232 Perform long running and blocking transactions in background threads. Primarily this moves bridge descriptor

1 0

[bridgedb/master] Merge branch 'hotfix/requirements-travis' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 238b1536dbcf0e4344f097e62aa574a64844fa73 Merge: 530f2b3 4c81926 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:34:09 2014 +0000 Merge branch 'hotfix/requirements-travis' into develop .travis.yml | 7 ++----- Makefile | 6 +++++- lib/bridgedb/util.py | 40 ++++++++++++++++++++++++---------------- requirements.txt | 3 --- 4 files changed, 31 insertions(+), 25 deletions(-)

1 0

[bridgedb/master] Call result of _getRotatingFileHandler() in unittest; it returns a partial() now.
by isis＠torproject.org 16 May '14

16 May '14

commit b0ac1b580f86b05d1071fe698d573c835c74cdb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:45:25 2014 +0000 Call result of _getRotatingFileHandler() in unittest; it returns a partial() now. --- lib/bridgedb/test/test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py index 354a4cd..a18e1c6 100644 --- a/lib/bridgedb/test/test_util.py +++ b/lib/bridgedb/test/test_util.py @@ -50,7 +50,7 @@ class MiscLoggingUtilTests(unittest.TestCase): logHandler = util._getRotatingFileHandler(filename) self.assertTrue(os.path.isfile(filename)) self.assertEqual(os.stat_result(os.stat(filename)).st_mode, 33152) - self.assertIsInstance(logHandler, + self.assertIsInstance(logHandler(), util.logging.handlers.RotatingFileHandler) def test_configureLogging(self):

1 0

[bridgedb/master] PEP8 whitespace fix for method signature lines in Dist.
by isis＠torproject.org 16 May '14

16 May '14

commit 06b114765e4691173b2653bd1e3239b11f37038d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:25:08 2014 +0000 PEP8 whitespace fix for method signature lines in Dist. --- lib/bridgedb/Dist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 4e0a1aa..984dd59 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -377,8 +377,8 @@ class EmailBasedDistributor(Distributor): """Assign a bridge to this distributor.""" self.splitter.insert(bridge) - def getBridgesForEmail(self, emailaddress, epoch, N=1, - parameters=None, countryCode=None, bridgeFilterRules=None): + def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, + countryCode=None, bridgeFilterRules=None): """Return a list of bridges to give to a user. emailaddress -- the user's email address, as given in a from line. epoch -- the time period when we got this request. This can

1 0

[bridgedb/master] Merge branch 'fix/11664-email-buffer-interface' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 44b14aaa1e39829d6bfab5b20000517293ff925e Merge: b0ac1b5 e829417 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 01:04:43 2014 +0000 Merge branch 'fix/11664-email-buffer-interface' into develop lib/bridgedb/EmailServer.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)

1 0

[bridgedb/master] Kill bridgedb.I18n and add new bridgedb.strings module.
by isis＠torproject.org 16 May '14

16 May '14

commit 242409d57460d6ab47c4443c1741bc6cd282bfac Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 2 16:55:28 2014 +0000 Kill bridgedb.I18n and add new bridgedb.strings module. This new module holds translated strings which are used in several places in the code, in order to save our helpful translators from having to translate the same boring string over and over again. This has been redesigned to permit these strings to be formatted for both the email and HTTPS distributors. --- README | 2 +- doc/sphinx/source/bridgedb.I18n.rst | 8 -- doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/bridgedb.strings.rst | 8 ++ doc/sphinx/source/conf.py | 2 +- lib/bridgedb/HTTPServer.py | 2 +- lib/bridgedb/I18n.py | 88 --------------- lib/bridgedb/strings.py | 182 ++++++++++++++++++++++++++++++++ 8 files changed, 194 insertions(+), 100 deletions(-) diff --git a/README b/README index 4724594..c5adf54 100644 --- a/README +++ b/README @@ -124,7 +124,7 @@ all the updated files in their correct locations. **Requesting Translations for Altered/Added Source Code**: This should be done whenever any of the strings requiring translation -- _("they are formatted like this") -- are changed, or new ones are added. - See ```lib/bridgedb/I18n.py```. + See ```lib/bridgedb/strings.py```. Translations for Tor Project repos are kept [in a separate repo](https://gitweb.torproject.org/translation.git). You'll diff --git a/doc/sphinx/source/bridgedb.I18n.rst b/doc/sphinx/source/bridgedb.I18n.rst deleted file mode 100644 index cd1274f..0000000 --- a/doc/sphinx/source/bridgedb.I18n.rst +++ /dev/null @@ -1,8 +0,0 @@ -bridgedb.I18n -------------- - -.. automodule:: bridgedb.I18n - :members: - :undoc-members: - :private-members: - :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 3c768cc..aa775f9 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -14,7 +14,6 @@ BridgeDB Package and Module Documentation bridgedb.EmailServer bridgedb.Filters bridgedb.HTTPServer - bridgedb.I18n bridgedb.Main bridgedb.parse bridgedb.persistent @@ -22,6 +21,7 @@ BridgeDB Package and Module Documentation bridgedb.safelog bridgedb.Stability bridgedb.Storage + bridgedb.strings bridgedb.Tests bridgedb.txrecaptcha bridgedb.util diff --git a/doc/sphinx/source/bridgedb.strings.rst b/doc/sphinx/source/bridgedb.strings.rst new file mode 100644 index 0000000..114931b --- /dev/null +++ b/doc/sphinx/source/bridgedb.strings.rst @@ -0,0 +1,8 @@ +bridgedb.strings +---------------- + +.. automodule:: bridgedb.strings + :members: + :undoc-members: + :private-members: + :show-inheritance: diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 0a71d87..977032f 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -35,13 +35,13 @@ import bridgedb.Dist import bridgedb.EmailServer import bridgedb.Filters import bridgedb.HTTPServer -import bridgedb.I18n import bridgedb.Main import bridgedb.persistent import bridgedb.runner import bridgedb.safelog import bridgedb.Stability import bridgedb.Storage +import bridgedb.strings import bridgedb.test import bridgedb.Tests import bridgedb.txrecaptcha diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c28dee0..cf8a83a 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -31,10 +31,10 @@ from twisted.web import static from twisted.web.util import redirectTo import bridgedb.Dist -import bridgedb.I18n as I18n from bridgedb import captcha from bridgedb import crypto +from bridgedb import strings from bridgedb import translations from bridgedb import txrecaptcha from bridgedb.Filters import filterBridgesByIP4 diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py deleted file mode 100644 index c6fbf3f..0000000 --- a/lib/bridgedb/I18n.py +++ /dev/null @@ -1,88 +0,0 @@ -# BridgeDB i18n strings & helper routines. The string should go into pootle - -import os -import gettext - -def getLang(lang, localedir=os.path.expanduser("~") + "/share/locale"): - """Return the Translation instance for a given language. If no Translation - instance is found, return the one for 'en' - """ - return gettext.translation("bridgedb", localedir=localedir, - languages=[lang], fallback="en") - -def _(text): - """This is necessary because strings are translated when they're imported. - Otherwise this would make it impossible to switch languages more than - once. - - :returns: The **text**. - """ - return text - -# All text that needs translation goes here -BRIDGEDB_TEXT = [ - # BRIDGEDB_TEXT[0] - _("""Here are your bridge relays: """), - # BRIDGEDB_TEXT[1] - _("""Bridge relays (or "bridges" for short) are Tor relays that aren't listed -in the main directory. Since there is no complete public list of them, -even if your ISP is filtering connections to all the known Tor relays, -they probably won't be able to block all the bridges."""), - # BRIDGEDB_TEXT[2] - _("""To use the above lines, go to Vidalia's Network settings page, and click -"My ISP blocks connections to the Tor network". Then add each bridge -address one at a time."""), - # BRIDGEDB_TEXT[3] - _("""Configuring more than one bridge address will make your Tor connection -more stable, in case some of the bridges become unreachable."""), - # BRIDGEDB_TEXT[4] - _("""Another way to find public bridge addresses is to send mail to -bridges(a)torproject.org with the line "get bridges" by itself in the body -of the mail. However, so we can make it harder for an attacker to learn -lots of bridge addresses, you must send this request from an email address at -one of the following domains:"""), - # BRIDGEDB_TEXT[5] - _("""[This is an automated message; please do not reply.]"""), - # BRIDGEDB_TEXT[6] - _("""Another way to find public bridge addresses is to visit -https://bridges.torproject.org/. The answers you get from that page -will change every few days, so check back periodically if you need more -bridge addresses."""), - # BRIDGEDB_TEXT[7] - _("""(no bridges currently available)"""), - # BRIDGEDB_TEXT[8] - _("""(e-mail requests not currently supported)"""), - # BRIDGEDB_TEXT[9] - _("""To receive your bridge relays, please prove you are human"""), - # BRIDGEDB_TEXT[10] - _("""You have exceeded the rate limit. Please slow down, the minimum time -between emails is: """), - # BRIDGEDB_TEXT[11] - _("""hours"""), - # BRIDGEDB_TEXT[12] - _("""All further emails will be ignored."""), - # BRIDGEDB_TEXT[13] - _("""Type the two words"""), - # BRIDGEDB_TEXT[14] - _("""I am human"""), - # BRIDGEDB_TEXT[15] - _("""Upgrade your browser to Firefox"""), - # BRIDGEDB_TEXT[16] - _("""(Might be blocked)"""), - # BRIDGEDB_TEXT[17] - _("""The following commands are also supported:"""), - # BRIDGEDB_TEXT[18] - _("""ipv6 : request ipv6 bridges."""), - # BRIDGEDB_TEXT[19] - _("""transport NAME : request transport NAME. Example: 'transport obfs2'"""), - # BRIDGEDB_TEXT[20] - _("""Looking for IPv6 bridges?"""), - # BRIDGEDB_TEXT[21] - _("""Looking for obfsproxy bridges?"""), - # BRIDGEDB_TEXT[22] - _("""Specify transport by name:"""), - # BRIDGEDB_TEXT[23] - _("""Submit"""), - # BRIDGEDB_TEXT[24] - _("""days at this address""") -] diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py new file mode 100644 index 0000000..0157ecb --- /dev/null +++ b/lib/bridgedb/strings.py @@ -0,0 +1,182 @@ +# -*- coding: utf-8 -*- + +from __future__ import unicode_literals + + +def _(text): + """This is necessary because strings are translated when they're imported. + Otherwise this would make it impossible to switch languages more than + once. + + :returns: The **text**. + """ + return text + + +# TRANSLATORS: Please do not translate the word "TYPE". +EMAIL_MISC_TEXT = { + 0: _("""\ +[This is an automated message; please do not reply.]"""), + 1: _("""\ +Here are your bridges:"""), + 2: _("""\ +You have exceeded the rate limit. Please slow down! The minimum time between +emails is %s hours. All further emails during this time period will be ignored."""), + 3: _("""\ +COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"""), + 4: _("Welcome to BridgeDB!"), + # TRANLATORS: Please DO NOT tranlate the words "transport" or "TYPE". + 5: _("Currently supported tranport TYPEs:"), +} + +WELCOME = { + 0: _("""\ +BridgeDB can provide bridges with several %stypes of Pluggable Transports%s, +which can help obfuscate your connections to the Tor Network, making it more +difficult for anyone watching your internet traffic to determine that you are +using Tor.\n\n"""), + + 1: _("""\ +Some bridges with IPv6 addresses are also available, though some Pluggable +Transports aren't IPv6 compatible.\n\n"""), + + 2: _("""\ +Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any +Pluggable Transports %s which maybe doesn't sound as cool, but they can still +help to circumvent internet censorship in many cases.\n\n"""), +} +"""These strings should go on the first "Welcome" email sent by the +:mod:`~bridgedb.EmailServer`, as well as on the ``index.html`` template used +by the :mod:`~bridgedb.HTTPServer`. They are used as an introduction to +explain what Tor bridges are, what bridges do, and why someone might want to +use bridges. +""" + +FAQ = { + 0: _("What are bridges?"), + 1: _("""\ +%s Bridges %s are Tor relays that help you circumvent censorship."""), +} + +OTHER_DISTRIBUTORS = { + 0: _("I need an alternative way of getting bridges!"), + 1: _("""\ +Another way to get bridges is to send an email to %s. Please note that you must +send the email using an address from one of the following email providers: +%s or %s."""), +} + +HELP = { + 0: _("My bridges don't work! I need help!"), + 1: _("""If your Tor doesn't work, you should email %s."""), + 2: _("""\ +Try including as much info about your case as you can, including the list of +bridges and Pluggable Transports you tried to use, your Tor Browser version, +and any messages which Tor gave out, etc."""), +} + +BRIDGES = { + 0: _("Bridges"), + 1: _("Get Bridges!"), +} + +OPTIONS = { + 0: _("Please select options for bridge type:"), + 1: _("Do you need IPv6 addresses?"), + 2: _("Do you need a %s?"), +} + +CAPTCHA = { + 0: _('Your browser is not displaying images properly.'), + 1: _('Enter the characters from the image above...'), +} + +HOWTO_TBB = { + 0: _("""How to start using your bridges"""), + 1: _("""\ +To enter bridges into Tor Browser, follow the instructions on the %s Tor +Browser download page %s to start Tor Browser."""), + 2: _("""\ +When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow +the wizard until it asks:"""), + 3: _("""\ +Does your Internet Service Provider (ISP) block or otherwise censor connections +to the Tor network?"""), + 4: _("""\ +Select 'Yes' and then click 'Next'. To configure your new bridges, copy and +paste the bridge lines (shown above) into the text input box. Finally, click +'Connect', and you should be good to go! If you experience trouble, try +clicking the 'Help' button in the 'Tor Network Settings' wizard for further +assistance."""), +} + +EMAIL_COMMANDS = { + "get help": _("Displays this message."), + "get bridges": _("Request vanilla bridges."), + "get ipv6": _("Request IPv6 bridges."), + # TRANLATORS: Please DO NOT tranlate the word the word "TYPE". + "get transport [TYPE]": _("Request a Pluggable Transport by TYPE."), + #"subscribe": _("Subscribe to receive new bridges once per week") + #"unsubscribe": _("Cancel a subscription to new bridges") +} + +#----------------------------------------------------------------------------- +# All of the following containers are untranslated! +#----------------------------------------------------------------------------- + +#: A list of all currently available pluggable transports. By "currently +#: available" we mean: +#: +#: 1. The PT is in a widely accepted, usable state for most Tor users. +#: 2. The PT is currently publicly deployed *en masse*". +#: +CURRENT_TRANSPORTS = [ + "obfs2", + "obfs3", + "scramblesuit", +] + +EMAIL_SPRINTF = { + # Goes into the "%s types of Pluggable Transports %s" part of ``WELCOME[0]`` + "WELCOME0": ("", "[0]"), + # Goes into the "%s without Pluggable Transport %s" part of ``WELCOME[2]`` + "WELCOME2": ("-", "-"), + # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]`` + "HOWTO_TBB1": ("", "[0]"), + # For the "you should email %s" in ``HELP[0]`` + "HELP0": ("help(a)rt.torproject.org"), +} +"""``EMAIL_SPRINTF`` is a dictionary that maps translated strings which +contain format specifiers (i.e. ``%s``) to what those format specifiers should +be replaced with in a given template system. + +For example, a string which needs a pair of HTML ``("<a href=''">, "</a>")`` +tags (for the templates used by :mod:`bridgedb.HTTPServer`) would need some +alternative replacements for the :mod:`EmailServer`, because the latter uses +templates with a ``text/plain`` mimetype instead of HTML. For the +``EmailServer``, the format strings specifiers are replaced with an empty +string where the opening ``<a>`` tags would go, and a numbered Markdown link +specifier where the closing ``</a>`` tags would go. + +The keys in this dictionary are the Python variable names of the corresponding +strings which are being formatted, i.e. ``WELCOME0`` would be the string +replacements for ``strings.WELCOME.get(0)``. + + +For example, the ``0`` string in :data:`WELCOME` above has the substring:: + + "%s without Pluggable Transport %s" + +and so to replace the two ``%s`` format specifiers, you would use this mapping +like so:: + +>>> from bridgedb import strings +>>> welcome = strings.WELCOME.get(0) +>>> emailWelcome = welcome.format(strings.EMAIL_SPRINTF.get("WELCOME0")) +>>> emailWelcome +""" + +EMAIL_REFERENCE_LINKS = { + "WELCOME0": "[0]: https://www.torproject.org/docs/pluggable-transports.html", + "HOWTO_TBB1": "[0]: https://www.torproject.org/projects/torbrowser.html.en#downloads-beta", +}

1 0