[tor-commits] [bridgedb/develop] Add riseup.net to HTTPS "I need an alternative way of getting bridges!".

[isis at torproject.org]

commit 07791b83e9b99050214c0b128eae03fd32adc5b8
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Apr 16 19:50:29 2014 +0000

    Add riseup.net to HTTPS "I need an alternative way of getting bridges!".
---
 lib/bridgedb/strings.py          |    2 +-
 lib/bridgedb/templates/base.html |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py
index a631da7..d223f63 100644
--- a/lib/bridgedb/strings.py
+++ b/lib/bridgedb/strings.py
@@ -83,7 +83,7 @@ OTHER_DISTRIBUTORS = {
     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."""),
+%s, %s or %s."""),
 }
 
 HELP = {
diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html
index 1673c3a..05d6285 100644
--- a/lib/bridgedb/templates/base.html
+++ b/lib/bridgedb/templates/base.html
@@ -70,6 +70,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
     <p>
     ${_(strings.OTHER_DISTRIBUTORS[1]) % \
        ("""<a href="mailto:bridges at torproject.org">bridges at torproject.org</a>""",
+        """<a href="https://riseup.net/">Riseup</a>""",
         """<a href="https://mail.google.com/">Gmail</a>""",
         """<a href="https://mail.yahoo.com/">Yahoo</a>""")}
     </p>