diff --git a/INSTALL b/INSTALL index ca45cdc5d..c6f7e65d7 100644 --- a/INSTALL +++ b/INSTALL @@ -336,6 +336,12 @@ main templates directory:: # ln -s /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 /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 diff --git a/extensions/stats/grapher.py b/extensions/stats/grapher.py index ea493de20..da749a1cf 100644 --- a/extensions/stats/grapher.py +++ b/extensions/stats/grapher.py @@ -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) diff --git a/extensions/stats/logparser.py b/extensions/stats/logparser.py index 08e964fde..dd53ffcae 100755 --- a/extensions/stats/logparser.py +++ b/extensions/stats/logparser.py @@ -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): diff --git a/extensions/stats/main.py b/extensions/stats/main.py index 808bf18ba..a7d1f65a9 100644 --- a/extensions/stats/main.py +++ b/extensions/stats/main.py @@ -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 }) diff --git a/extensions/stats/templates/graphs.html b/extensions/stats/templates/graphs.html index 5c1709303..4643d2192 100644 --- a/extensions/stats/templates/graphs.html +++ b/extensions/stats/templates/graphs.html @@ -1,6 +1,6 @@ {% load i18n %} -{% for g, title in graphs.items %} -

{{ title }}

-

{{ elems.label }} +

{% trans 'No statistics available' %}

{% endfor %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8c1760074..b27fc70c8 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \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"