[or-cvs] r14457: This adds an i18n directory for keeping our translation temp (in check/trunk: . cgi-bin i18n)
ioerror at seul.org
ioerror at seul.org
Fri Apr 25 04:32:31 UTC 2008
Author: ioerror
Date: 2008-04-25 00:32:31 -0400 (Fri, 25 Apr 2008)
New Revision: 14457
Added:
check/trunk/i18n/
check/trunk/i18n/TorCheck.pot
check/trunk/i18n/TorCheck_fa-IR.po
Removed:
check/trunk/cgi-bin/TorCheck.pot
Modified:
check/trunk/cgi-bin/index.py
Log:
This adds an i18n directory for keeping our translation template and it adds our first partial translation in Farsi. Furtmore, it removes the inline (but commented out) Farsi from the main application.
Deleted: check/trunk/cgi-bin/TorCheck.pot
===================================================================
--- check/trunk/cgi-bin/TorCheck.pot 2008-04-25 03:34:06 UTC (rev 14456)
+++ check/trunk/cgi-bin/TorCheck.pot 2008-04-25 04:32:31 UTC (rev 14457)
@@ -1,63 +0,0 @@
-# TorCheck gettext template
-# Copyright (C) 2008 Jacob Appelbaum
-# Jacob Appelbaum <jacob at appelbaum.net>, 2008
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: TorCheck untagged beta\n"
-"POT-Creation-Date: 2008-04-24 20:28+PDT\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Jacob Appelbaum <jacob at appelbaum.net>\n"
-"Language-Team: Tor Translation <tor-translation at torproject.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#: index.py:145
-msgid "Congratulations. You are using Tor.<br><br>"
-msgstr ""
-
-#: index.py:149
-msgid ""
-"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely.<br><br>\n"
-msgstr ""
-
-#: index.py:157
-msgid ""
-"Sorry. You are not using Tor.\n"
-"<br><br>"
-msgstr ""
-
-#: index.py:160
-msgid "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions for configuring your Tor client</a>.<br><br>"
-msgstr ""
-
-#: index.py:176
-msgid ""
-"Sorry, your query failed or an unexpected response was received.\n"
-"<br>"
-msgstr ""
-
-#: index.py:178
-msgid "A temporary service outage prevents us from determining if your source IP address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For other ways to test whether you are using Tor, please visit <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a>.<br><br>"
-msgstr ""
-
-#: index.py:185
-msgid ""
-"Additional information:<br>\n"
-msgstr ""
-
-#: index.py:187
-msgid "Your IP appears to be: "
-msgstr ""
-
-#: index.py:190
-msgid "This small script is powered by <a href=\"http://exitlist.torproject.org/\">tordnsel</a><br><br>"
-msgstr ""
-
-#: index.py:192
-msgid "This server does not log <i>any</i> information about visitors.<br>"
-msgstr ""
-
Modified: check/trunk/cgi-bin/index.py
===================================================================
--- check/trunk/cgi-bin/index.py 2008-04-25 03:34:06 UTC (rev 14456)
+++ check/trunk/cgi-bin/index.py 2008-04-25 04:32:31 UTC (rev 14457)
@@ -6,6 +6,8 @@
# Written at ToorCon Seattle 2008 (Thanks for the great time h1kari!)
# Thanks to Crispen for a power outlet :-)
#
+# Additional python suggestions from nickm
+#
# Best used with the Debian packages:
# python-dns
# libapache2-mod-python
@@ -89,6 +91,7 @@
locale = default_locale
locales = ( default_locale, 'fa-IR')
+ # TODO: Remove all of this debug information when we know this works properly
req.write("We have %i possible locales.\n<br>\n" % len(locales))
req.write("Our internal and supported locales are: ")
for item in locales:
@@ -128,6 +131,7 @@
req.write('<html>\n')
req.write('<body>\n')
+ # TODO: Remove this
req.write('Debug info: <br>')
req.write('UsingTor is set to: %s<br>' % UsingTor )
@@ -142,30 +146,22 @@
req.write('\n')
req.write('<img src="https://check.torproject.org/tor-on.png">\n<br>')
req.write('<h1 style="color: #0A0">\n')
- req.write(_('Congratulations. You are using Tor.<br><br>'))
- #req.write('ﻡژﺪﻫ. ﺶﻣﺍ (ﺎﺤﺘﻣﺍﻻ) ﺩﺭ ﺡﺎﻟ ﺎﺴﺘﻓﺍﺪﻫ ﺍﺯ ﺕُﺭ ﻡی ﺏﺎﺷیﺩ.')
+ req.write(_('Congratulations. You are using Tor.'))
req.write('<br>\n<br>\n')
req.write('</h1>\n')
- req.write(_('Please refer to the <a href="https://www.torproject.org/">Tor website</a> for further information about using Tor safely.<br><br>\n'))
- #req.write('ﺥﻭﺎﻬﺸﻤﻧﺩ ﺎﺴﺗ ﻡﺭﺎﺠﻌﻫ کﻥیﺩ ﺐﻫ <a href="https://www.torproject.org/">ﻮﺑ ﺱﺍیﺕ ﺕُﺭ</a> ﺏﺭی ﺎﻃﻼﻋﺎﺗ ﺏیﺶﺗﺭ ﺩﺮﻣﻭﺭﺩ ﺎﺴﺘﻓﺪﻫ ﺍیﻢﻧ ﺍﺯ ﺕُﺭ<br><bbr>')
+ req.write(_('Please refer to the <a href="https://www.torproject.org/">Tor website</a> for further information about using Tor safely.'))
+ req.write('<br>\n<br>\n')
# This is the case where we have an NXDOMAIN and they aren't using Tor
elif UsingTor == 1:
req.write('\n')
req.write('<img src="https://check.torproject.org/tor-off.png">\n<br>')
req.write('<h1 style="color: #A00">')
- req.write(_('Sorry. You are not using Tor.\n<br><br>'))
- #req.write('پﻭﺰﺷ. ﺶﻣﺍ (ﺎﺤﺘﻣﺍﻻ) ﺩﺭ ﺡﺎﻟ ﺎﺴﺘﻓﺍﺪﻫ ﺍﺯ ﺕُﺭ ﻦﻣی ﺏﺎﺷیﺩ.\n<br><br>')
+ req.write(_('Sorry. You are not using Tor.'))
+ req.write('<br>\n<br>\n')
req.write('</h1>')
- req.write(_('If you are attempting to use a Tor client, please refer to the <a href="https://www.torproject.org/">Tor website</a> and specifically the <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">instructions for configuring your Tor client</a>.<br><br>'))
- #req.write('ﺍگﺭ ﺲﻋی ﺩﺭ ﺎﺴﺘﻓﺍﺪﻫ ﺍﺯ یک کﺍﺮﺧﻭﺎﻫ ﺕُﺭ ﺭﺍ ﺩﺍﺭیﺩ, ﺥﻭﺎﻬﺸﻤﻧﺩ ﺎﺴﺗ ﻡﺭﺎﺠﻌﻫ کﻥیﺩ ﺐﻫ ')
- #req.write('<a href="https://www.torproject.org/">')
- #req.write('ﻮﺑ ﺱﺍیﺕ ﺕُﺭ')
- #req.write('</a> ')
- #req.write('ﻭ ﺏﻭیژﻩ ')
- #req.write('<a href="https://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">')
- #req.write('ﺪﺴﺗﻭﺭﺎﺗ ﺏﺭﺍی پیکﺮﺒﻧﺩی کﺍﺮﺧﻭﺎﻫ ﺕُﺭ.')
- #req.write('</a><br><br>')
+ req.write(_('If you are attempting to use a Tor client, please refer to the <a href="https://www.torproject.org/">Tor website</a> and specifically the <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">instructions for configuring your Tor client</a>.'))
+ req.write('<br>\n<br>\n')
# This means we have some strange data response we don't understand
# It's better that we fail closed and let the user know everything went wrong
@@ -173,25 +169,25 @@
req.write('\n')
req.write('<img src="https://check.torproject.org/tor-off.png">\n<br>')
req.write('<h1 style="color: #A00">\n')
- req.write(_('Sorry, your query failed or an unexpected response was received.\n<br>'))
+ req.write(_('Sorry, your query failed or an unexpected response was received.'))
+ req.write('<br>\n')
req.write('</h1>')
- req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node. For other ways to test whether you are using Tor, please visit <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this FAQ entry</a>.<br><br>'))
+ req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node. For other ways to test whether you are using Tor, please visit <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this FAQ entry</a>.'))
+ req.write('<br>\n<br>\n')
# Now we'll close up this html rat hole
req.write('\n')
req.write('<br>\n');
req.write('<small>\n')
req.write('<p><tt>')
- req.write(_('Additional information:<br>\n'))
- #req.write('ﺎﻃﻼﻋﺎﺗ ﺕکﻡیﻝی:<br>\n')
+ req.write(_('Additional information: '))
+ req.write('<br>\n')
req.write(_('Your IP appears to be: '))
req.write('<b>%s</b><br>\n' % req.connection.remote_ip )
- #req.write('ﺁﺩﺮﺳ ﺁی پی ﺶﻣﺍ: <b>%s</b><br>\n' % req.connection.remote_ip )
- req.write(_('This small script is powered by <a href="http://exitlist.torproject.org/">tordnsel</a><br><br>'))
- #req.write('ﺍیﻥ ﺪﺴﺗ<200c>ﻧﻮﺸﺘﻫ کﻭچک ﺍﺭﺎﺌﻫ ﻡی ﺵﻭﺩ ﺏﻮﺳیﻞﻫ <a href="http://exitlist.torproject.org/">tordnsel</a><br><br>')
- req.write(_('This server does not log <i>any</i> information about visitors.<br>'))
- #req.write('ﺍیﻥ پیﺵکﺍﺭ ﻩیچ ﺎﻃﻼﻋﺎﺗی ﺩﺮﻣﻭﺭﺩ کﺍﺮﺑﺭﺎﻧ ﻢﻬﻣﺎﻧ ﺭﺍ ﺚﺒﺗ ﻦﻣی کﻥﺩ.<br>')
- req.write('\n<br>\n')
+ req.write(_('This small script is powered by <a href="http://exitlist.torproject.org/">tordnsel</a>'))
+ req.write('<br><br>')
+ req.write(_('This server does not log <i>any</i> information about visitors.'))
+ req.write('<br>\n<br>\n')
req.write('</tt></p>')
req.write('</small>')
req.write('</center>\n')
Copied: check/trunk/i18n/TorCheck.pot (from rev 14456, check/trunk/cgi-bin/TorCheck.pot)
===================================================================
--- check/trunk/i18n/TorCheck.pot (rev 0)
+++ check/trunk/i18n/TorCheck.pot 2008-04-25 04:32:31 UTC (rev 14457)
@@ -0,0 +1,46 @@
+# TorCheck gettext template
+# Copyright (C) 2008 Jacob Appelbaum
+# Jacob Appelbaum <jacob at appelbaum.net>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TorCheck untagged beta\n"
+"POT-Creation-Date: 2008-04-24 20:28+PDT\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Jacob Appelbaum <jacob at appelbaum.net>\n"
+"Language-Team: Tor Translation <tor-translation at torproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+
+msgid "Congratulations. You are using Tor."
+msgstr ""
+
+msgid "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely."
+msgstr ""
+
+msgid "Sorry. You are not using Tor."
+msgstr ""
+
+msgid "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions for configuring your Tor client</a>."
+msgstr ""
+
+msgid "Sorry, your query failed or an unexpected response was received."
+msgstr ""
+
+msgid "A temporary service outage prevents us from determining if your source IP address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For other ways to test whether you are using Tor, please visit <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a>."
+msgstr ""
+
+msgid "Additional information: "
+msgstr ""
+
+msgid "Your IP appears to be: "
+msgstr ""
+
+msgid "This small script is powered by <a href=\"http://exitlist.torproject.org/\">tordnsel</a>"
+msgstr ""
+
+msgid "This server does not log <i>any</i> information about visitors."
+msgstr ""
+
Added: check/trunk/i18n/TorCheck_fa-IR.po
===================================================================
--- check/trunk/i18n/TorCheck_fa-IR.po (rev 0)
+++ check/trunk/i18n/TorCheck_fa-IR.po 2008-04-25 04:32:31 UTC (rev 14457)
@@ -0,0 +1,46 @@
+# TorCheck gettext template
+# Copyright (C) 2008 Jacob Appelbaum
+# Jacob Appelbaum <jacob at appelbaum.net>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TorCheck untagged beta\n"
+"POT-Creation-Date: 2008-04-24 20:28+PDT\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Jacob Appelbaum <jacob at appelbaum.net>\n"
+"Language-Team: Tor Translation <tor-translation at torproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+
+msgid "Congratulations. You are using Tor."
+msgstr "ﻡژﺪﻫ. ﺶﻣﺍ (ﺎﺤﺘﻣﺍﻻ) ﺩﺭ ﺡﺎﻟ ﺎﺴﺘﻓﺍﺪﻫ ﺍﺯ ﺕُﺭ ﻡی ﺏﺎﺷیﺩ."
+
+msgid "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely."
+msgstr "'ﺥﻭﺎﻬﺸﻤﻧﺩ ﺎﺴﺗ ﻡﺭﺎﺠﻌﻫ کﻥیﺩ ﺐﻫ <a href="https://www.torproject.org/">ﻮﺑ ﺱﺍیﺕ ﺕُﺭ</a> ﺏﺭی ﺎﻃﻋﺎﺗ ﺏیﺶﺗﺭ ﺩﺮﻣﻭﺭﺩ ﺎﺴﺘﻓﺪﻫ ﺍیﻢﻧ ﺍﺯ ﺕُﺭ"
+
+msgid "Sorry. You are not using Tor."
+msgstr "پﻭﺰﺷ. ﺶﻣﺍ (ﺎﺤﺘﻣﺍﻻ) ﺩﺭ ﺡﺎﻟ ﺎﺴﺘﻓﺍﺪﻫ ﺍﺯ ﺕُﺭ ﻦﻣی ﺏﺎﺷیﺩ."
+
+msgid "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions for configuring your Tor client</a>."
+msgstr ""
+
+msgid "Sorry, your query failed or an unexpected response was received."
+msgstr ""
+
+msgid "A temporary service outage prevents us from determining if your source IP address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For other ways to test whether you are using Tor, please visit <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a>."
+msgstr ""
+
+msgid "Additional information: "
+msgstr "ﺎﻃﻼﻋﺎﺗ ﺕکﻡیﻝی: "
+
+msgid "Your IP appears to be: "
+msgstr "ﺁﺩﺮﺳ ﺁی پی ﺶﻣﺍ: "
+
+msgid "This small script is powered by <a href=\"http://exitlist.torproject.org/\">tordnsel</a>"
+msgstr "ﺍیﻥ ﺪﺴﺗ<200c>ﻧﻮﺸﺘﻫ کﻭچک ﺍﺭﺎﺌﻫ ﻡی ﺵﻭﺩ ﺏﻮﺳیﻞﻫ <a href="http://exitlist.torproject.org/">tordnsel</a>"
+
+msgid "This server does not log <i>any</i> information about visitors."
+msgstr "ﺍیﻥ پیﺵکﺍﺭ ﻩیچ ﺎﻃﻼﻋﺎﺗی ﺩﺮﻣﻭﺭﺩ کﺍﺮﺑﺭﺎﻧ ﻢﻬﻣﺎﻧ ﺭﺍ ﺚﺒﺗ ﻦﻣی کﻥﺩ."
+
More information about the tor-commits
mailing list