[tor-commits] [bridgedb/master] 4568 - Update obfs version and I18 text

[aagbsn at torproject.org]

commit 0426a51c9a55ca434581577d855224eafc09ee79
Author: aagbsn <aagbsn at extc.org>
Date:   Fri Jun 22 07:29:26 2012 -0700

    4568 - Update obfs version and I18 text
    
    obfs2 is the correct version
---
 lib/bridgedb/I18n.py   |    8 ++++++--
 lib/bridgedb/Server.py |    6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py
index 1e90348..a1c82c9 100644
--- a/lib/bridgedb/I18n.py
+++ b/lib/bridgedb/I18n.py
@@ -71,7 +71,11 @@ between emails is: """),
  _("""The following commands are also supported:"""),
  # BRIDGEDB_TEXT[18]
  _(""" ipv6 : request ipv6 bridges """),
- # bridgedb_text[19]
+ # BRIDGEDB_TEXT[19]
  _(""" transport TRANSPORT_NAME : request bridges with transport
-TRANSPORT_NAME, such as obfs3.""")
+TRANSPORT_NAME, such as obfs2."""),
+ # BRIDGEDB_TEXT[20]
+ _("""Looking for IPv6 bridges?"""),
+ # BRIDGEDB_TEXT[21]
+ _("""Looking for obfsproxy bridges?""")
 ]
diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py
index 172a0ba..8ce9ce2 100644
--- a/lib/bridgedb/Server.py
+++ b/lib/bridgedb/Server.py
@@ -229,8 +229,10 @@ class WebResource(twisted.web.resource.Resource):
                    + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "</p>" \
                    + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "</p>" \
                    + email_domain_list \
-                   + "<hr /><p><a href='?ipv6=true'>Looking for IPv6 bridges?</a></p>" \
-                   + "<p><a href='?transport=obfs3'>Looking for obfsproxy bridges?</a></p>" \
+                   + "<hr /><p><a href='?ipv6=true'>" \
+		   + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a></p>" \
+                   + "<p><a href='?transport=obfs2'>" \
+		   + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a></p>" \
                    + "</body></html>"
 
         return html_msg