From 76c9cbf40c24cf03b84dda39de7dd74855c38598 Mon Sep 17 00:00:00 2001 From: tonio Date: Thu, 29 Oct 2009 15:05:16 +0100 Subject: [PATCH] Bugfix and french translation update. --- extensions/amavis_quarantine/main.py | 8 +++- locale/fr/LC_MESSAGES/django.po | 63 ++++++++++++++-------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/extensions/amavis_quarantine/main.py b/extensions/amavis_quarantine/main.py index cc8a50211..3797f5529 100644 --- a/extensions/amavis_quarantine/main.py +++ b/extensions/amavis_quarantine/main.py @@ -82,8 +82,8 @@ def render_listing(request, cursor): emails.append({"from" : row[0], "to" : row[1], "subject" : row[2], "content" : row[3], "mailid" : row[4], "time" : datetime.fromtimestamp(row[5]), - "type" : row[6]}) - + "type" : row[6]}) + paginator = Paginator(emails, 10) try: pagenum = int(request.GET.get('page', '1')) @@ -220,6 +220,8 @@ def _redirect_to_index(request, message, count): @login_required def delete(request, mail_id, count=1): conn = db.getconnection("amavis_quarantine") + if mail_id[0] != "'": + mail_id = "'%s'" % mail_id status, error = db.execute(conn, "DELETE FROM msgs WHERE mail_id IN (%s)" % mail_id) if status: @@ -232,6 +234,8 @@ def delete(request, mail_id, count=1): @login_required def release(request, mail_id, count=1): conn = db.getconnection("amavis_quarantine") + if mail_id[0] != "'": + mail_id = "'%s'" % mail_id status, cursor = db.execute(conn, """ SELECT msgs.mail_id,secret_id,quar_type,maddr.email FROM msgs, maddr, msgrcpt WHERE msgrcpt.mail_id=msgs.mail_id AND msgrcpt.rid=maddr.id AND msgs.mail_id IN (%s) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c6006e2fe..72ffca6d1 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-10-27 15:48+0100\n" +"POT-Creation-Date: 2009-10-29 14:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: LANGUAGE \n" @@ -115,25 +115,41 @@ msgstr "Un alias avec cette adresse existe déjà" msgid "admin is intouchable!!" msgstr "admin est intouchable!!" -#: admin/templatetags/admin_extras.py:8 +#: admin/templatetags/admin_extras.py:11 msgid "enabled_m" msgstr "Activé" -#: admin/templatetags/admin_extras.py:8 +#: admin/templatetags/admin_extras.py:11 msgid "enabled_f" msgstr "Activée" -#: extensions/amavis_quarantine/main.py:48 +#: admin/templatetags/admin_extras.py:19 templates/admin/newmailbox.html:7 +msgid "New mailbox" +msgstr "Nouvelle boite aux lettres" + +#: admin/templatetags/admin_extras.py:26 templates/admin/domains.html:16 +msgid "Mailboxes" +msgstr "Boites aux lettres" + +#: admin/templatetags/admin_extras.py:30 +msgid "Aliases" +msgstr "Alias" + +#: admin/templatetags/admin_extras.py:37 +msgid "Properties" +msgstr "Propriétés" + +#: extensions/amavis_quarantine/main.py:49 #: extensions/amavis_quarantine/templates/index.html:151 msgid "Quarantine" msgstr "Quarantaine" -#: extensions/amavis_quarantine/main.py:227 +#: extensions/amavis_quarantine/main.py:226 #, python-format msgid "%(count)d message%(plural)s deleted successfully" msgstr "%(count)d message%(plural)s supprimé correctement" -#: extensions/amavis_quarantine/main.py:265 +#: extensions/amavis_quarantine/main.py:264 #, fuzzy, python-format msgid "%(count)d message%(plural)s released successfully" msgstr "%(count)d messages relâché correctement" @@ -190,9 +206,8 @@ msgid "From" msgstr "De" #: extensions/amavis_quarantine/templates/listing.html:33 -#, fuzzy msgid "Date" -msgstr "Supprimer" +msgstr "" #: extensions/amavis_quarantine/templates/viewheader.html:36 msgid "Message headers" @@ -203,9 +218,8 @@ msgid "Mail content" msgstr "Contenu du message" #: extensions/amavis_quarantine/templates/viewmail.html:41 -#, fuzzy msgid "Message" -msgstr "Entêtes du message" +msgstr "" #: extensions/amavis_quarantine/templatetags/amextras.py:13 msgid "View as plain text" @@ -277,6 +291,10 @@ msgstr "sujet" msgid "content" msgstr "contenu" +#: main/models.py:10 +msgid "until" +msgstr "" + #: main/views.py:45 msgid "Auto reply message updated successfully." msgstr "Message de réponse auto. mis à jour." @@ -332,7 +350,7 @@ msgstr "" msgid "Address" msgstr "Adresse" -#: templates/admin/aliases.html:16 +#: templates/admin/aliases.html:16 templates/admin/editmailbox.html:7 msgid "Mailbox" msgstr "Boite aux lettres" @@ -349,22 +367,6 @@ msgstr "Editer cet alias" msgid "Delete alias" msgstr "Supprimer cet alias" -#: templates/admin/domain_menu.html:12 templates/admin/newmailbox.html:7 -msgid "New mailbox" -msgstr "Nouvelle boite aux lettres" - -#: templates/admin/domain_menu.html:18 templates/admin/domains.html:16 -msgid "Mailboxes" -msgstr "Boites aux lettres" - -#: templates/admin/domain_menu.html:22 -msgid "Aliases" -msgstr "Alias" - -#: templates/admin/domain_menu.html:28 -msgid "Properties" -msgstr "Propriétés" - #: templates/admin/domains.html:6 msgid "Available domains" msgstr "Domaines disponibles" @@ -395,7 +397,7 @@ msgid "yes,no" msgstr "oui,non" #: templates/admin/editalias.html:14 templates/admin/editdomain.html:15 -#: templates/admin/editmailbox.html:16 templates/main/autoreply.html:17 +#: templates/admin/editmailbox.html:16 templates/main/autoreply.html:19 #: templates/main/chpassword.html:15 msgid "Update" msgstr "Mettre à jour" @@ -453,16 +455,15 @@ msgid "No domain admin defined." msgstr "Aucun admin de domaine défini." #: templates/admin/settings_menu.html:7 -#, fuzzy msgid "Permissions" -msgstr "Ajouter une permission" +msgstr "" #: templates/main/confirm.html:26 #, fuzzy msgid "Do not delete mailbox directory" msgstr "Ne pas supprimer le répertoire de la boite aux lettres" -#: templates/main/header.html:6 +#: templates/main/header.html:8 msgid "General" msgstr "Général"