Some corrections before releasing.

This commit is contained in:
tonio
2009-11-04 15:57:16 +01:00
parent b9f9b88ad8
commit be0c80b572
6 changed files with 20 additions and 16 deletions
+6
View File
@@ -336,6 +336,12 @@ main templates directory::
# ln -s <mailng_dir>/extensions/amavis_quarantine/templates \
templates/amavis_quarantine
When viewing messages, you can choose to display links (addresses,
images). In order to display images correctly, you need to create a
tmp directory under static/ for storing them. For example::
# mkdir <mailng_dir>/static/tmp
To be able to release messages, first take a look at this page::
http://www.ijs.si/software/amavisd/amavisd-new-docs.html#quar-release
+1 -1
View File
@@ -84,7 +84,7 @@ class Grapher(object):
*params)
def make_defaults(self, target, tpl=traffic_avg_template):
end = "now"
end = "%d" % int(time.mktime(time.localtime()))
self.process(target, "day", "-1day", end, tpl)
self.process(target, "week", "-1week", end, tpl)
self.process(target, "month", "-1month", end, tpl)
+1
View File
@@ -103,6 +103,7 @@ class LogParser(object):
'--start', str(m),
'--step', str(rrdstep),
*params)
sys.exit(1)
return m
def update_rrd(self, dom, t):
+6 -6
View File
@@ -91,9 +91,9 @@ def adminindex(request):
domains = Domain.objects.all()
return _render(request, 'stats/adminindex.html', {
"domains" : domains, "domain" : domain,
"graphs" : {"traffic" : _("Average normal traffic"),
"badtraffic" : _("Average bad traffic"),
"size" : _("Average normal traffic size")},
"graphs" : [{"name" : "traffic", "label" : _("Average normal traffic")},
{"name" : "badtraffic", "label" : _("Average bad traffic")},
{"name" : "size", "label" : _("Average normal traffic size")}],
"periods" : ["day", "week", "month", "year"],
"period" : period
})
@@ -109,9 +109,9 @@ def index(request, dom_id=None):
return _render(request, 'stats/index.html', {
"domain" : domain,
"graphs" : {"traffic" : _("Average normal traffic"),
"badtraffic" : _("Average bad traffic"),
"size" : _("Average normal traffic size")},
"graphs" : [{"name" : "traffic", "label" : _("Average normal traffic")},
{"name" : "badtraffic", "label" : _("Average bad traffic")},
{"name" : "size", "label" : _("Average normal traffic size")}],
"periods" : ["day", "week", "month", "year"],
"period" : period
})
+3 -3
View File
@@ -1,6 +1,6 @@
{% load i18n %}
{% for g, title in graphs.items %}
<h3>{{ title }}</h3>
<p><img src="/static/graphs/{{ g }}_{{ domain }}_AVERAGE_{{ period }}.png"
{% for elems in graphs %}
<h3>{{ elems.label }}</h3>
<p><img src="/static/graphs/{{ elems.name }}_{{ domain }}_AVERAGE_{{ period }}.png"
alt="{% trans 'No statistics available' %}" /></p>
{% endfor %}
+3 -6
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-03 15:22+0100\n"
"POT-Creation-Date: 2009-11-04 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -345,7 +345,7 @@ msgstr ""
#: extensions/stats/grapher.py:32
msgid "bounced messages"
msgstr "messages ?"
msgstr "messages non remis"
#: extensions/stats/grapher.py:34
msgid "rejected messages"
@@ -381,7 +381,7 @@ msgstr "Mauvais trafic moyen"
#: extensions/stats/main.py:96 extensions/stats/main.py:114
msgid "Average normal traffic size"
msgstr "Taille moyenne du trafic moyen"
msgstr "Taille moyenne du trafic normal"
#: extensions/stats/templates/adminindex.html:31
msgid "Global statistics"
@@ -628,6 +628,3 @@ msgid "Your username and password didn't match. Please try again."
msgstr ""
"Votre nom d'utilisateur et mot de passe ne correspondent pas. Veuillez "
"réessayer."
#~ msgid "Domain name"
#~ msgstr "Nom du domaine"