Commit ac9cc2f0 authored by stef's avatar stef
Browse files

Merge branch 'master' of github.com:stef/nnmon

parents e201a321 1965372a
[extractors] [extractors]
django = babeldjango.extract:extract_django django = babeldjango.extract:extract_django
[django: templates/**.*] [django: templates/*.*]
[django: templates/comments/*.*]
[python: bt/**.py] [python: bt/**.py]
...@@ -31,6 +31,7 @@ COUNTRIES = ( ...@@ -31,6 +31,7 @@ COUNTRIES = (
('FI', _('Finland')), ('FI', _('Finland')),
('SE', _('Sweden')), ('SE', _('Sweden')),
('UK', _('United Kingdom ')), ('UK', _('United Kingdom ')),
('NO', _('Norway')),
) )
RESOURCES = ( RESOURCES = (
......
...@@ -51,8 +51,8 @@ def activate(request): ...@@ -51,8 +51,8 @@ def activate(request):
if v: if v:
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest() actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
to=[x.email for x in User.objects.filter(groups__name='moderator')] to=[x.email for x in User.objects.filter(groups__name='moderator')]
msg = MIMEText(_("A new report was submitted. To approve click here: %s/moderate/?key=%s\n") % (settings.ROOT_URL or 'http://localhost:8001/', actid)) msg = MIMEText(_("A new report was submitted. To approve click here: %s/moderate/?key=%s\n") % (settings.ROOT_URL or 'http://localhost:8001/', actid), _charset="utf-8")
msg['Subject'] = _('NNMon submission approval') msg['Subject'] = _('NNMon submission approval').encode("Utf-8")
msg['From'] = 'nnmon@nnmon.lqdn.fr' msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['To'] = ', '.join(to) msg['To'] = ', '.join(to)
s = smtplib.SMTP('localhost') s = smtplib.SMTP('localhost')
...@@ -60,7 +60,7 @@ def activate(request): ...@@ -60,7 +60,7 @@ def activate(request):
s.quit() s.quit()
v.activationid=actid v.activationid=actid
v.save() v.save()
messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after we\'ve checked that the report is valid.')) messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after we\'ve checked that the report is valid.').encode("Utf-8"))
return HttpResponseRedirect('/') # Redirect after POST return HttpResponseRedirect('/') # Redirect after POST
def moderate(request): def moderate(request):
...@@ -108,8 +108,8 @@ def confirm(request, id, name=None): ...@@ -108,8 +108,8 @@ def confirm(request, id, name=None):
def sendverifymail(service,to): def sendverifymail(service,to):
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest() actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
msg = MIMEText(_("Thank you for submitting a new report. To finalize your submission please confirm using your validation key.\nYour verification key is %s/%s%s\nPlease note that reports are moderated, it might take some time before your report appears online. Thank you for your patience.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid)) msg = MIMEText(_("Thank you for submitting a new report. To finalize your submission please confirm using your validation key.\nYour verification key is %s/%s%s\nPlease note that reports are moderated, it might take some time before your report appears online. Thank you for your patience.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid), _charset="utf-8")
msg['Subject'] = _('NNMon submission verification') msg['Subject'] = _('NNMon submission verification').encode("Utf-8")
msg['From'] = 'nnmon@nnmon.lqdn.fr' msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['To'] = to msg['To'] = to
s = smtplib.SMTP('localhost') s = smtplib.SMTP('localhost')
......
#!/bin/sh
# launch this in the python virtualenv to regenerate the .pot :
pybabel extract -F babel.cfg -o locale/django.pot .
# then this to push it to transifex (after cheching you didn't loose anything
# tx push -s
# To pull the translated language do this :
# tx pull
# To add a language link with transifex do :
# tx set -r nnmon.messagespot -l nl locale/nl/LC_MESSAGES/django.po
This diff is collapsed.
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2011-09-22 17:44+0200\n" "POT-Creation-Date: 2011-09-22 18:16+0200\n"
"PO-Revision-Date: 2011-09-22 01:00+0200\n" "PO-Revision-Date: 2011-09-22 01:00+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: bg <LL@li.org>\n" "Language-Team: bg <LL@li.org>\n"
...@@ -366,47 +366,51 @@ msgstr "" ...@@ -366,47 +366,51 @@ msgstr ""
msgid "For enquiries about the project, please contact:" msgid "For enquiries about the project, please contact:"
msgstr "" msgstr ""
#: templates/add.html:30 #: templates/add.html:31
msgid "New Violation" msgid "New Violation"
msgstr "" msgstr ""
#: templates/add.html:33 templates/index.html:104 #: templates/add.html:34 templates/index.html:104
msgid "Provide optional details" msgid "Provide optional details"
msgstr "" msgstr ""
#: templates/add.html:44 templates/index.html:115 #: templates/add.html:45 templates/index.html:115
msgid "save" msgid "save"
msgstr "" msgstr ""
#: templates/base.html:28 #: templates/base.html:24
msgid "name and shame operators restricting access to the Internet"
msgstr ""
#: templates/base.html:29
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
#: templates/base.html:30 #: templates/base.html:31
msgid "Admin" msgid "Admin"
msgstr "" msgstr ""
#: templates/base.html:32 #: templates/base.html:33
msgid "Login" msgid "Login"
msgstr "" msgstr ""
#: templates/base.html:37 #: templates/base.html:38
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: templates/base.html:38 #: templates/base.html:39
msgid "Cases" msgid "Cases"
msgstr "" msgstr ""
#: templates/base.html:39 #: templates/base.html:40
msgid "What's Net Neutrality" msgid "What's Net Neutrality"
msgstr "" msgstr ""
#: templates/base.html:40 #: templates/base.html:41
msgid "Start Monitoring" msgid "Start Monitoring"
msgstr "" msgstr ""
#: templates/base.html:41 #: templates/base.html:42
msgid "Contact" msgid "Contact"
msgstr "" msgstr ""
...@@ -456,97 +460,110 @@ msgid "Add New Case" ...@@ -456,97 +460,110 @@ msgid "Add New Case"
msgstr "" msgstr ""
#: templates/index.html:119 #: templates/index.html:119
msgid "On Internet, you decide what you do, right? Not anymore!" msgid "On the Internet, <b>you</b> decide what you do, right? <i>Not anymore!</i>"
msgstr "" msgstr ""
#: templates/index.html:120 #: templates/index.html:120
msgid "" msgid ""
"We all rely more and more on our access to Internet to do serious things " "Large telecommunication providers want to control what you do online. "
"like find jobs and fun things like chat with friends. But telco's are " "They want to block and throttle some of your communications, and charge "
"increasingly trying to control your behavior online, by restricting the " "you to use certain online services, content and applications."
"things you are doing on the internet. Now you have a chance to do "
"something about that!"
msgstr "" msgstr ""
#: templates/index.html:121 #: templates/index.html:121
msgid "Now is the time to fight back!"
msgstr ""
#: templates/index.html:122
msgid "" msgid ""
"Help us chart all the ways that internet providers are violating our " "Help us chart all the ways that internet providers are violating our "
"online freedom: Is your operator blocking or throttling your Internet " "online freedom. Tell us about how your landline or mobile operator "
"communications, for instance by making it impossible to use chat programs" "Internet provider restricts your connection. You can do so in less than "
" or charging extra for Internet telephony? Let us know by filling up this" "two minutes!"
" form (it takes less than two minutes!). We will make sure that the "
"relevant authorities are informed, so that we can put an end to this."
msgstr "" msgstr ""
#: templates/index.html:122 #: templates/index.html:123
msgid ""
"We will report these violations to the European Commission and national "
"authorities and demand action to address them."
msgstr ""
#: templates/index.html:124
msgid ""
"Don't hesitate to give us feedback on this application by reporting any "
"idea or issue with RespectMyNet.eu here : <a "
"href='https://nnmon.quadpad.lqdn.fr/feedback'>Feedback pad page</a>"
msgstr ""
#: templates/index.html:125
msgid "Featured Cases" msgid "Featured Cases"
msgstr "" msgstr ""
#: templates/index.html:126 #: templates/index.html:129
msgid "Infringing offering" msgid "Infringing offering"
msgstr "" msgstr ""
#: templates/index.html:127 #: templates/index.html:130
msgid "Confirmed" msgid "Confirmed"
msgstr "" msgstr ""
#: templates/index.html:137 templates/list.html:69 #: templates/index.html:140 templates/list.html:70
msgid "" msgid ""
"In order to <strong>validate your confirmation</strong> of this case, " "In order to <strong>validate your confirmation</strong> of this case, "
"please enter your email address" "please enter your email address"
msgstr "" msgstr ""
#: templates/index.html:139 #: templates/index.html:142
msgid "ok" msgid "ok"
msgstr "" msgstr ""
#: templates/index.html:140 templates/list.html:73 #: templates/index.html:143 templates/list.html:74
msgid "cancel" msgid "cancel"
msgstr "" msgstr ""
#: templates/index.html:146 #: templates/index.html:149
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: templates/list.html:41 #: templates/list.html:42
msgid "" msgid ""
"This is a list of all reported violations of net neutrality. See <a " "This is a list of all reported violations of net neutrality. See <a "
"href='/about'>What is net neutrality</a> for a short explanation. " "href='/about'>What is net neutrality</a> for a short explanation. "
msgstr "" msgstr ""
#: templates/list.html:45 #: templates/list.html:46
msgid "country" msgid "country"
msgstr "" msgstr ""
#: templates/list.html:46 #: templates/list.html:47
msgid "operator" msgid "operator"
msgstr "" msgstr ""
#: templates/list.html:47 #: templates/list.html:48
msgid "contract" msgid "contract"
msgstr "" msgstr ""
#: templates/list.html:48 #: templates/list.html:49
msgid "resource" msgid "resource"
msgstr "" msgstr ""
#: templates/list.html:49 #: templates/list.html:50
msgid "type" msgid "type"
msgstr "" msgstr ""
#: templates/list.html:50 #: templates/list.html:51
msgid "fixed / wireless" msgid "fixed / wireless"
msgstr "" msgstr ""
#: templates/list.html:51 #: templates/list.html:52
msgid "confirmations" msgid "confirmations"
msgstr "" msgstr ""
#: templates/list.html:66 templates/view.html:85 #: templates/list.html:67 templates/view.html:85
msgid "confirm" msgid "confirm"
msgstr "" msgstr ""
#: templates/list.html:72 #: templates/list.html:73
msgid "OK" msgid "OK"
msgstr "" msgstr ""
...@@ -599,25 +616,30 @@ msgstr "" ...@@ -599,25 +616,30 @@ msgstr ""
#: templates/start.html:7 #: templates/start.html:7
msgid "" msgid ""
"Do you want to check whether your access provider is manipulating your " "Do you want to check whether your access provider is manipulating your "
"internet traffic? Great! There are a lot of tools which make life easier " "internet traffic? Great!"
"for you. Here is a short selection."
msgstr "" msgstr ""
#: templates/start.html:8 #: templates/start.html:8
msgid "Recommended tools" msgid ""
"There are a lot of tools which make life easier for you. Here is a short "
"selection."
msgstr "" msgstr ""
#: templates/start.html:9 #: templates/start.html:9
msgid "Recommended tools"
msgstr ""
#: templates/start.html:10
msgid "" msgid ""
"These tools are probably the most helpful when it comes to tracking " "These tools are probably the most helpful when it comes to tracking "
"traffic discrimination." "traffic discrimination."
msgstr "" msgstr ""
#: templates/start.html:12 #: templates/start.html:13
msgid "available for MacOS Ubuntu Windows" msgid "Available for Mac OS X, Ubuntu (GNU/Linux) and Windows."
msgstr "" msgstr ""
#: templates/start.html:13 #: templates/start.html:14
msgid "" msgid ""
"Neubot is a research project on network neutrality of the NEXA Center for" "Neubot is a research project on network neutrality of the NEXA Center for"
" Internet & Society at Politecnico di Torino. The project is based on a " " Internet & Society at Politecnico di Torino. The project is based on a "
...@@ -631,11 +653,11 @@ msgid "" ...@@ -631,11 +653,11 @@ msgid ""
"monitor network neutrality." "monitor network neutrality."
msgstr "" msgstr ""
#: templates/start.html:16 #: templates/start.html:17
msgid "in-browser java" msgid "In-browser Java."
msgstr "" msgstr ""
#: templates/start.html:17 #: templates/start.html:18
msgid "" msgid ""
"Test whether certain applications or traffic are being blocked or " "Test whether certain applications or traffic are being blocked or "
"throttled on your broadband connection. Glasnost attempts to detect " "throttled on your broadband connection. Glasnost attempts to detect "
...@@ -645,55 +667,49 @@ msgid "" ...@@ -645,55 +667,49 @@ msgid ""
" BitTorrent, eMule and Gnutella." " BitTorrent, eMule and Gnutella."
msgstr "" msgstr ""
#: templates/start.html:20 #: templates/start.html:21
msgid "runs on PocketPCs" msgid "Runs on PocketPCs."
msgstr "" msgstr ""
#: templates/start.html:21 #: templates/start.html:22
msgid "" msgid ""
"Detect whether your mobile broadband provider is performing application " "Detect whether your mobile broadband provider is performing application "
"or service specific differentiation." "or service specific differentiation."
msgstr "" msgstr ""
#: templates/start.html:25 #: templates/start.html:26
msgid "Additional tools" msgid "Additional tools"
msgstr "" msgstr ""
#: templates/start.html:26 #: templates/start.html:27
msgid "" msgid ""
"These tools are interesting to test the overall quality of your Internet " "These tools are interesting to test the overall quality of your Internet "
"connections." "connections."
msgstr "" msgstr ""
#: templates/start.html:29 #: templates/start.html:30
msgid "" msgid "Runs on <a href=\\"
"runs on <a "
"href=\"http://ndt.googlecode.com/files/AndroidNdt-1.0b1.apk\">Android</a>"
msgstr "" msgstr ""
#: templates/start.html:30 #: templates/start.html:31
msgid "" msgid ""
"Test your connection speed and receive sophisticated diagnosis of " "Test your connection speed and receive sophisticated diagnosis of "
"problems limiting speed." "problems limiting speed."
msgstr "" msgstr ""
#: templates/start.html:33 #: templates/start.html:34
msgid "Diagnose common problems that impact last-mile broadband networks." msgid "Diagnose common problems that impact last-mile broadband networks."
msgstr "" msgstr ""
#: templates/start.html:36 #: templates/start.html:37 templates/start.html:41
msgid "See how much bandwidth your connection provides" msgid "Runs on Mac OS X, GNU/Linux and Windows"
msgstr ""
#: templates/start.html:37
msgid "Windows, MacOSX, Linux"
msgstr "" msgstr ""
#: templates/start.html:40 #: templates/start.html:38
msgid "runs on Linux, MacOSX, Windows" msgid "See how much bandwidth your connection provides"
msgstr "" msgstr ""
#: templates/start.html:41 #: templates/start.html:42
msgid "" msgid ""
"Determine whether an ISP is performing traffic shaping. ShaperProbe " "Determine whether an ISP is performing traffic shaping. ShaperProbe "
"detects whether your ISP performs \"traffic shaping\". Traffic shaping " "detects whether your ISP performs \"traffic shaping\". Traffic shaping "
...@@ -704,7 +720,7 @@ msgid "" ...@@ -704,7 +720,7 @@ msgid ""
"shaping rate and the \"maximum burst size\" before shaping begins." "shaping rate and the \"maximum burst size\" before shaping begins."
msgstr "" msgstr ""
#: templates/start.html:44 #: templates/start.html:45
msgid "" msgid ""
"Passive monitoring by NANO-agent: NANO-agent monitors the number of " "Passive monitoring by NANO-agent: NANO-agent monitors the number of "
"packets transferred for each active flow per unit time, as well as tracks" "packets transferred for each active flow per unit time, as well as tracks"
...@@ -715,50 +731,50 @@ msgid "" ...@@ -715,50 +731,50 @@ msgid ""
"visualize your data by visiting this page." "visualize your data by visiting this page."
msgstr "" msgstr ""
#: templates/start.html:45 #: templates/start.html:46
msgid "" msgid ""
"Privacy: NANO will monitor all of your Internet traffic and send back " "Privacy: NANO will monitor all of your Internet traffic and send back "
"limited statistics, but does not collect data on what is being sent." "limited statistics, but does not collect data on what is being sent."
msgstr "" msgstr ""
#: templates/start.html:48 #: templates/start.html:49
msgid "" msgid ""
"torrent-protocol based sensor plugin for vuze/azareus bittorrent client " "Torrent-protocol based sensor plugin for Vuze/Azureus BitTorrent client "
"using a crowd approach sharing data with peers." "using a crowd approach sharing data with peers."
msgstr "" msgstr ""
#: templates/start.html:51 #: templates/start.html:52
msgid "torrent-protocol based sensor plugin for vuze/azareus bittorrent client" msgid "Torrent-protocol based sensor plugin for Vuze/Azureus BitTorrent client."
msgstr "" msgstr ""
#: templates/start.html:54 #: templates/start.html:55
msgid "browser java applet" msgid "browser java applet"
msgstr "" msgstr ""
#: templates/start.html:55 #: templates/start.html:56
msgid "" msgid ""
"comprehensive tcp/udp and protocol level sensor see <a " "comprehensive tcp/udp and protocol level sensor see <a "
"href=\"http://netalyzr.icsi.berkeley.edu/restore/id=example-" "href=\"http://netalyzr.icsi.berkeley.edu/restore/id=example-"
"session\">example report</a> for capabilities" "session\">example report</a> for capabilities"
msgstr "" msgstr ""
#: templates/start.html:58 #: templates/start.html:59
msgid "what not to report" msgid "What not to report"
msgstr "" msgstr ""
#: templates/start.html:59 #: templates/start.html:60
msgid "" msgid ""
"Sample of common ISP issues that DO NOT require a formal complaint (from:" "Sample of common ISP issues that DO NOT require a formal complaint (from:"
" http://www.ispreview.co.uk/new/complain/complain.shtml)" " http://www.ispreview.co.uk/new/complain/complain.shtml)"
msgstr "" msgstr ""
#: templates/start.html:62 #: templates/start.html:63
msgid "" msgid ""
"Brief and Uncommon Critical Service (Email, Website Browsing etc.) " "<b>Brief and Uncommon Critical Service (Email, Website Browsing etc.) "
"Outages." "Outages.</b>"
msgstr "" msgstr ""
#: templates/start.html:63 #: templates/start.html:64
msgid ""