[tor-commits] [bridgedb/master] Remove frontdesk email link.

[phw at torproject.org]

commit 55d248ba8bdc0563b5e3fab36ca9b7c6069c6e16
Author: Philipp Winter <phw at nymity.ch>
Date:   Wed Sep 4 11:06:14 2019 -0700

    Remove frontdesk email link.
    
    The frontdesk is seeing plenty of empty bogus emails.  Let's remove the
    email links and instead encourage users to take a look at the Tor
    Browser Manual and at our Support Portal.
    
    This fixes <https://bugs.torproject.org/28533>.
---
 CHANGELOG                                       | 5 +++++
 bridgedb/distributors/https/templates/base.html | 7 ++-----
 bridgedb/strings.py                             | 9 +--------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c3073ef..a8413eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,11 @@ Changes in version 0.8.1 -
         commands whose email body line starts with a '>' character, which is
         typically used for email quotes.
 
+        * FIXES https://bugs.torproject.org/28533
+        The frontdesk is seeing plenty of empty bogus emails.  This fix removes
+        the email links and instead encourages users to take a look at the Tor
+        Browser Manual and at our Support Portal.
+
 Changes in version 0.8.0 - 2019-08-20
 
         * FIXES https://bugs.torproject.org/9316
diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html
index d7b6045..423b43c 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -66,8 +66,8 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
             <h4>${_(strings.HELP[0])}</h4>
             <p>
               ${_(strings.HELP[1]) % \
-                 ("""<a href="mailto:frontdesk at torproject.org">frontdesk at torproject.org</a>""")}
-              ${_(strings.HELP[2])}
+                 ("""<a href="https://tb-manual.torproject.org/circumvention/">Tor Browser Manual</a>""",
+                  """<a href="https://support.torproject.org/#censorship">Support Portal</a>""")}
             </p>
           </div>
         </div> <!-- end faq -->
@@ -84,9 +84,6 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
     <a href="https://gitweb.torproject.org/bridgedb.git/tree/CHANGELOG">
       <i class="icon icon-large icon-rocket"><span id="footer-changelog"> ${_("Changelog")}</span></i></a>
       ·  
-    <a href="mailto:frontdesk at torproject.org">
-      <i class="icon icon-large icon-envelope"><span id="footer-contact"> ${_("Contact")}</span></i></a>
-      ·  
     <a href="../keys"><i class="icon icon-large icon-key"><span id="footer-keys"> ${_("Public Keys")}</span></i></a>
   </p>
   <br />
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 569f339..2a83751 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -114,14 +114,7 @@ send the email using an address from one of the following email providers:
 HELP = {
     0: _("My bridges don't work! I need help!"),
     # TRANSLATORS: Please DO NOT translate "Tor".
-    1: _("""If your Tor doesn't work, you should email %s."""),
-    # TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-    # TRANSLATORS: Please DO NOT translate "Tor Browser".
-    # TRANSLATORS: Please DO NOT translate "Tor".
-    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."""),
+    1: _("""If your Tor cannot connect, please take a look at the %s and our %s."""),
 }
 
 BRIDGES = {