Commit dcea5e27 authored by stef's avatar stef
Browse files

[enh] reworded some text

parent 94333f31
......@@ -57,7 +57,7 @@ def activate(request):
s.quit()
v.activationid=actid
v.save()
messages.add_message(request, messages.INFO, _('Thank you for verifying your submission.'))
messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after verifying it\'s a valid report.'))
return HttpResponseRedirect('/') # Redirect after POST
def moderate(request):
......@@ -94,7 +94,7 @@ def confirm(request, id, name=None):
def sendverifymail(service,to):
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\n") % (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\nYour report will be listed after we assured it is valid.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid))
msg['Subject'] = _('NNMon submission verification')
msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['To'] = to
......
......@@ -98,13 +98,11 @@ $(document).ready(function(){
</form>
</div>
<div id='content'>
<h2>{% trans "How is this working?" %}</h2>
<ol>
<li>{% trans "People experience some kind of network neutrality violation such as blocking, filtering or throttling, they report their findings on our site." %}</li>
<li>{% trans "we advertise the new violations to ellicit further confirmations and technical analysis by other customers of the same provider." %}</li>
<li>{% trans "we assemble a complete dossier on the violation and submit it to the responsible National Regulatory Authority (NRA)" %}</li>
<li>{% trans "in 6 months from the start we submit a complete list to Commissioner Kroes." %}</li>
</ol>
<h2>{% trans "On Internet, you decide what you do, right? Not anymore!" %}</h2>
<p>{% trans "Large telecommunication providers want to control what you do online. They want to block and throttle some of your communications, and charge you for using some online services, content and applications." %}</p>
<p>{% trans "Now is the time to fight back!" %}</p>
<p>{% trans "Help us chart all the ways that internet providers are violating our online freedom. Tell us about how *your* landline or mobile Internet provider restricts your connection. You can do so in less than two minutes!" %}</p>
<p>{% trans "We will report these violations to the European Commission and national authorities and require action to address them." %}</p>
</div>
<div id='latest3'>
<h2>{% trans "Latest Infringements" %}</h2>
......
......@@ -29,6 +29,7 @@
{% endfor %}
</ul>
{% endif %}
<p>{% trans "This is a list of all reported and validated violations of net neutrality. See <a href='/about/What_is_net_neutrality'>What is net neutrality</a> for a short explanation. See <a href='/about/'>About</a> for more information on how violations are reported and validated." %}</p>
<table class="listing tablesorter" id='sortedlist'>
<thead>
<tr>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment