[tor-commits] [bridgedb] 01/02: Add description about telegram and settings distributors

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main
in repository bridgedb.

commit 161de41718b93cfc46d3932059b8d690e98cf504
Author: meskio <meskio@xxxxxxxxxxxxxx>
AuthorDate: Thu Mar 31 12:16:18 2022 +0200

    Add description about telegram and settings distributors
    
    The /info website now describes what those distributors are.
    
    Closes: #40046
---
 bridgedb/distributors/https/templates/info.html | 16 +++++++++++++---
 bridgedb/strings.py                             | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/bridgedb/distributors/https/templates/info.html b/bridgedb/distributors/https/templates/info.html
index 32f9e0a..8740a74 100644
--- a/bridgedb/distributors/https/templates/info.html
+++ b/bridgedb/distributors/https/templates/info.html
@@ -27,13 +27,23 @@
            ("""<a href="mailto:bridges@xxxxxxxxxxxxxx";>""",
             """</a>""")}</p>
 
-        <h4><a name="reserved">${_(strings.BRIDGEDB_INFO[5])}</a></h4>
+        <h4><a name="settings">Settings</a></h4>
+        <p>${_(strings.BRIDGEDB_INFO[5]) % \
+           ("""<a href="https://gitlab.torproject.org/tpo/anti-censorship/rdsys-admin/-/blob/main/conf/circumvention.json";>""",
+            """</a>""")}</p>
+
+        <h4><a name="telegram">Telegram</a></h4>
         <p>${_(strings.BRIDGEDB_INFO[6]) % \
+           ("""<a href="https://t.me/GetBridgesBot";>""",
+            """</a>""")}</p>
+
+        <h4><a name="reserved">${_(strings.BRIDGEDB_INFO[7])}</a></h4>
+        <p>${_(strings.BRIDGEDB_INFO[8]) % \
            ("""<a href="https://collector.torproject.org/archive/bridge-pool-assignments/";>""",
             """</a>""")}</p>
 
-        <h4><a name="none">${_(strings.BRIDGEDB_INFO[7])}</a></h4>
-        <p>${_(strings.BRIDGEDB_INFO[8])}</p>
+        <h4><a name="none">${_(strings.BRIDGEDB_INFO[9])}</a></h4>
+        <p>${_(strings.BRIDGEDB_INFO[10])}</p>
       </div>
     </p>
   </div>
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 8310be6..cc66d1a 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -131,16 +131,25 @@ bridges."""),
 Users can request bridges from the "Email" distribution mechanism by sending an
 email to %sbridges@xxxxxxxxxxxxxx%s and writing "get transport obfs4" in the
 email body."""),
-    5: _("Reserved"),
+    5: _("""\
+The "Settings" distributor is used by Tor Browser and other clients to
+autoconfigure the circumvention settings depending on the location of the user.
+It uses a %smap of countries and what cicumvention mechanism works on each%s to
+to provide the right kind of bridge for each country."""),
     6: _("""\
+Users can request bridges from the "Telegram" distribution mechanism by sending
+the '\\bridges' command to %s@GetBridgesBot%s over the Telegram instant
+messaging network."""),
+    7: _("Reserved"),
+    8: _("""\
 BridgeDB maintains a small number of bridges that are not distributed
 automatically.  Instead, we reserve these bridges for manual distribution and
 hand them out to NGOs and other organizations and individuals that need
 bridges.  Bridges that are distributed over the "Reserved" mechanism may not
 see users for a long time.  Note that the "Reserved" distribution mechanism is
 called "Unallocated" in %sbridge pool assignment%s files."""),
-    7: _("None"),
-    8: _("""\
+    9: _("None"),
+    10: _("""\
 Bridges whose distribution mechanism is "None" are not distributed by BridgeDB.
 It is the bridge operator's responsibility to distribute their bridges to
 users.  Note that on Relay Search, a freshly set up bridge's distribution

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits