[tor-commits] [bridgedb/master] Update installation and translation instructions

[aagbsn@xxxxxxxxxxxxxx]

commit 7d0df5e1d30809eb4a00e41070676061829f1f73
Author: aagbsn <aagbsn@xxxxxxxx>
Date:   Tue May 28 14:52:50 2013 -0400

    Update installation and translation instructions
---
 README               |   33 +++++++++++++------
 lib/bridgedb/I18n.py |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/README b/README
index baca007..4fdeff1 100644
--- a/README
+++ b/README
@@ -1,8 +1,16 @@
-
 To set up:
  - Install Python 2.4 or later.
- - Install Twisted-Web, Twisted-Mail, PyOpenSSL, and all their dependencies.
+ - Install depdencencies. On Debian, you can do:
+   sudo apt-get install python-twisted python-openssl python-ipaddr \
+        python-gpgme python-babel python-recaptcha python-beautifulsoup \
+	python-mako
+ - If you use a virtualenv, we recommend you use pip 1.3.1 or later, else it
+   will download over http. You can install dependencies with:
+   pip install -r requirements.txt
+   Note that some dependencies (ipaddr) do not have SSL URLs in the pypi index
+   and will still download over http.
  - To run unit tests, "python setup.py test"
+ - Set the prefix in setup.cfg, or comment out if using a virtualenv
  - python setup.py install
  - To generate translation files, run "python setup.py trans" 
  - Run "python setup.py install_data" to install them
@@ -26,12 +34,18 @@ To set up:
                http://pypi.python.org/pypi/BeautifulSoup
                http://pypi.python.org/pypi/pygpgme
 
-To re-generate and update the i18n files (in case translated strings
-have changed in BridgeDB):
- - Run:
-     xgettext lib/bridgedb/I18n.py -dbridgedb -oi18n/templates/bridgedb.pot
-     msgen -o i18n/en/bridgedb.po --lang=en i18n/templates/bridgedb.pot
-     msgmerge -U i18n/de/bridgedb.po i18n/templates/bridgedb.pot
+To translate:
+   - extract all strings:
+      python setup.py extract_messages
+      a .pot file will be created in ./i18n/templates/bridgedb.pot
+   - init catalogs for each desired languages:
+      python setup.py init_catalog -l LANG
+      (where 'LANG' is the 2 or 4 letter country-code, eg. 'es')
+   - edit strings in ./i18n/LANG/bridgedb.po
+   - convert to binary format
+     python setup.py compile_catalog
+   - Don't forget to reinstall to update the templates!:
+     python setup.py install
 
 To run:
  - Run "python -m TorBridgeDB bridgedb.conf"
@@ -89,6 +103,5 @@ To update the SQL schema:
    CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email );
    REPLACE INTO Config VALUES ( 'schema-version', 2 );
  
-
 Support
- - Send your questions to nickm.
+ - Send your questions to aagbsn@xxxxxxxxxxxxxxx
diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py
new file mode 100644
index 0000000..112b8ae
--- /dev/null
+++ b/lib/bridgedb/I18n.py
@@ -0,0 +1,86 @@
+# 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
+    """
+    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@xxxxxxxxxxxxxx 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""")
+]



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits