mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-18 05:51:26 +02:00
Bad translation + nicer presentation (for empty folder or empty quarantine).
This commit is contained in:
tonio
@@ -60,7 +60,7 @@ def _listing(request, internal=False, filter=None):
|
||||
content = lst.fetch(request, page.id_start, page.id_stop)
|
||||
navbar = lst.render_navbar(page)
|
||||
else:
|
||||
content = _("Empty quarantine")
|
||||
content = "<div class='info'>%s</div>" % _("Empty quarantine")
|
||||
navbar = ""
|
||||
ctx = getctx("ok", listing=content, navbar=navbar,
|
||||
menu=quar_menu("", request.user.get_all_permissions()))
|
||||
|
||||
@@ -80,7 +80,7 @@ def listing_menu(selection, folder, user):
|
||||
"width" : "150",
|
||||
"menu" : [
|
||||
{"name" : "fdaction",
|
||||
"label" : _("Compact folder"),
|
||||
"label" : _("Compress folder"),
|
||||
"img" : "/static/pics/compress.png",
|
||||
"url" : "compact/%s/" % folder},
|
||||
{"name" : "fdaction",
|
||||
|
||||
@@ -51,17 +51,18 @@ def folder(request, name, updatenav=True):
|
||||
baseurl=name, folder=name, order=order, **optparams)
|
||||
|
||||
page = lst.paginator.getpage(request.session["page"])
|
||||
if page:
|
||||
content = lst.fetch(request, page.id_start, page.id_stop)
|
||||
navbar = lst.render_navbar(page)
|
||||
else:
|
||||
content = _("Empty folder")
|
||||
navbar = ""
|
||||
folders = render_to_string("webmail/folders.html", {
|
||||
"folders" : lst.getfolders()
|
||||
})
|
||||
ctx = getctx("ok", folders=folders, listing=content, navbar=navbar,
|
||||
menu=listing_menu("", name, request.user))
|
||||
dico = {"folders" : folders, "menu" : listing_menu("", name, request.user)}
|
||||
if page:
|
||||
dico["listing"] = lst.fetch(request, page.id_start, page.id_stop)
|
||||
dico["navbar"] = lst.render_navbar(page)
|
||||
else:
|
||||
dico["listing"] = "<div class='info'>%s</div>" \
|
||||
% _("This folder contains no messages")
|
||||
dico["navbar"] = ""
|
||||
ctx = getctx("ok", **dico)
|
||||
return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
|
||||
|
||||
@login_required
|
||||
|
||||
@@ -121,7 +121,7 @@ class EmailListing:
|
||||
if not self.empty:
|
||||
page = self.paginator.getpage(pageid)
|
||||
if not page:
|
||||
listing = "Empty folder"
|
||||
listing = _("This folder contains no messages")
|
||||
else:
|
||||
listing = self.fetch(request, page.id_start, page.id_stop)
|
||||
elapsed = kwargs.has_key("start") and time.time() - kwargs["start"] or 0
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-06-14 09:54+0200\n"
|
||||
"POT-Creation-Date: 2010-06-24 13:33+0200\n"
|
||||
"PO-Revision-Date: 2010-06-10 23:21+0200\n"
|
||||
"Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -205,7 +205,7 @@ msgstr ""
|
||||
msgid "Failed to rename mailbox, check permissions"
|
||||
msgstr "Mailbox konnte nicht umbenannt werden. Prüfen Sie die Berechtigungen."
|
||||
|
||||
#: admin/views.py:295 admin/views.py:326
|
||||
#: admin/views.py:296 admin/views.py:326
|
||||
msgid "Alias with this name already exists"
|
||||
msgstr "Ein Alias mit dieser Adresse existiert bereits"
|
||||
|
||||
@@ -318,23 +318,23 @@ msgid "Path to the PDP server socket (if unix mode)"
|
||||
msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)"
|
||||
|
||||
#: extensions/amavis_quarantine/main.py:50
|
||||
#: extensions/amavis_quarantine/templates/index.html:137
|
||||
#: extensions/amavis_quarantine/templates/index.html:130
|
||||
msgid "Quarantine"
|
||||
msgstr "Quarantäne"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:14
|
||||
#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:23
|
||||
#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:27
|
||||
msgid "From"
|
||||
msgstr "Von"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:15
|
||||
#: extensions/webmail/forms.py:8 extensions/webmail/lib.py:21
|
||||
#: extensions/webmail/views.py:323 templates/common/email_searchbar.html:7
|
||||
#: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25
|
||||
#: extensions/webmail/views.py:332 templates/common/email_searchbar.html:7
|
||||
msgid "Subject"
|
||||
msgstr "Betreff"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:24
|
||||
#: extensions/webmail/views.py:324
|
||||
#: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28
|
||||
#: extensions/webmail/views.py:333
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
@@ -356,11 +356,11 @@ msgid_plural "%(count)d messages released successfully"
|
||||
msgstr[0] "%(count)d Nachicht erfolgreich freigegeben"
|
||||
msgstr[1] "%(count)d Nachichten erfolgreich freigegeben"
|
||||
|
||||
#: extensions/amavis_quarantine/templates/index.html:90
|
||||
#: extensions/amavis_quarantine/templates/index.html:83
|
||||
msgid "Release this selection?"
|
||||
msgstr "Auswahl freigeben?"
|
||||
|
||||
#: extensions/amavis_quarantine/templates/index.html:97
|
||||
#: extensions/amavis_quarantine/templates/index.html:90
|
||||
msgid "Delete this selection?"
|
||||
msgstr "Auswahl löschen?"
|
||||
|
||||
@@ -440,6 +440,10 @@ msgstr "Nachrichten-Header"
|
||||
msgid "Bad MIME"
|
||||
msgstr "Schlechtes MIME"
|
||||
|
||||
#: extensions/dummy_plugin/main.py:24
|
||||
msgid "Dummy"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/postfix_autoreply/forms.py:18
|
||||
msgid "This date is over"
|
||||
msgstr "Das Datum ist vorbei"
|
||||
@@ -577,7 +581,7 @@ msgstr "Jahr"
|
||||
msgid "Custom"
|
||||
msgstr "Individuell"
|
||||
|
||||
#: extensions/stats/views.py:74
|
||||
#: extensions/stats/views.py:66
|
||||
msgid "Bad custom period"
|
||||
msgstr "Ungültiger individueller Zeitraum"
|
||||
|
||||
@@ -585,23 +589,23 @@ msgstr "Ungültiger individueller Zeitraum"
|
||||
msgid "Global statistics"
|
||||
msgstr "Globale Statistiken"
|
||||
|
||||
#: extensions/stats/templates/content.html:83
|
||||
#: extensions/stats/templates/content.html:84
|
||||
msgid "Domain:"
|
||||
msgstr "Domäne:"
|
||||
|
||||
#: extensions/stats/templates/content.html:85
|
||||
#: extensions/stats/templates/content.html:86
|
||||
msgid "Global"
|
||||
msgstr "Global"
|
||||
|
||||
#: extensions/stats/templates/content.html:93
|
||||
#: extensions/stats/templates/content.html:94
|
||||
msgid "Period:"
|
||||
msgstr "Zeitraum:"
|
||||
|
||||
#: extensions/stats/templates/content.html:102
|
||||
#: extensions/stats/templates/content.html:103
|
||||
msgid "Start"
|
||||
msgstr "Start"
|
||||
|
||||
#: extensions/stats/templates/content.html:104
|
||||
#: extensions/stats/templates/content.html:105
|
||||
msgid "End"
|
||||
msgstr "Aktiviert"
|
||||
|
||||
@@ -625,12 +629,12 @@ msgstr "An"
|
||||
msgid "Cc"
|
||||
msgstr "Cc"
|
||||
|
||||
#: extensions/webmail/lib.py:177
|
||||
#: extensions/webmail/lib.py:184
|
||||
msgid "Connection to IMAP server failed, check your configuration"
|
||||
msgstr ""
|
||||
"Verbindung zu IMAP-Server fehlgeschlagen, Überprüfen Sie Ihre Konfiguration"
|
||||
|
||||
#: extensions/webmail/lib.py:181
|
||||
#: extensions/webmail/lib.py:188
|
||||
msgid "Authentication failed, check your configuration"
|
||||
msgstr "Authentifizierung fehlgeschlagen, Überprüfen Sie Ihre Konfiguration"
|
||||
|
||||
@@ -678,20 +682,19 @@ msgstr "Ordner für Gesendete Nachrichten"
|
||||
msgid "Simple IMAP webmail"
|
||||
msgstr "Einfaches IMAP-Webmail"
|
||||
|
||||
#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:385
|
||||
#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:275
|
||||
msgid "Webmail"
|
||||
msgstr "Webmail"
|
||||
|
||||
#: extensions/webmail/views.py:58
|
||||
#: extensions/webmail/templatetags/webextras.py:87
|
||||
msgid "Empty folder"
|
||||
msgstr "Leerer Ordner"
|
||||
#: extensions/webmail/views.py:58 lib/email_listing.py:124
|
||||
msgid "This folder contains no messages"
|
||||
msgstr "Dieser Ordner enthält keine Einträge"
|
||||
|
||||
#: extensions/webmail/views.py:304
|
||||
#: extensions/webmail/views.py:313
|
||||
msgid "wrote:"
|
||||
msgstr "schrieb:"
|
||||
|
||||
#: extensions/webmail/views.py:322
|
||||
#: extensions/webmail/views.py:331
|
||||
msgid "Original message"
|
||||
msgstr "Gesendete Nachrichten"
|
||||
|
||||
@@ -748,12 +751,17 @@ msgid "Actions"
|
||||
msgstr "Aktionen"
|
||||
|
||||
#: extensions/webmail/templatetags/webextras.py:83
|
||||
msgid "Compact folder"
|
||||
msgid "Compress folder"
|
||||
msgstr "Ordner komprimieren"
|
||||
|
||||
#: extensions/webmail/templatetags/webextras.py:87
|
||||
msgid "Empty folder"
|
||||
msgstr "Leerer Ordner"
|
||||
|
||||
#: lib/__init__.py:63
|
||||
#, python-format
|
||||
msgid "Invalid action, %(user)s is a local user"
|
||||
msgstr "Unzulässige Aktion, %s ist ein lokaler Benutzer"
|
||||
msgstr "Unzulässige Aktion, %(user)s ist ein lokaler Benutzer"
|
||||
|
||||
#: templates/nlayout.html:33
|
||||
msgid "Admin"
|
||||
@@ -922,11 +930,11 @@ msgstr "Letztes"
|
||||
msgid "Save"
|
||||
msgstr "Speichern"
|
||||
|
||||
#: templates/registration/login.html:7
|
||||
#: templates/registration/login.html:8
|
||||
msgid "Welcome to MailNG"
|
||||
msgstr "Willkommen bei MailNG"
|
||||
|
||||
#: templates/registration/login.html:27
|
||||
#: templates/registration/login.html:28
|
||||
msgid "Welcome"
|
||||
msgstr "Willkommen"
|
||||
|
||||
@@ -955,4 +963,3 @@ msgstr "Neues Passwort"
|
||||
#: userprefs/forms.py:26
|
||||
msgid "Old password mismatchs"
|
||||
msgstr "Altes Passwort stimmt nicht überein"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-06-14 09:54+0200\n"
|
||||
"POT-Creation-Date: 2010-06-24 13:33+0200\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"
|
||||
@@ -206,7 +206,7 @@ msgstr ""
|
||||
msgid "Failed to rename mailbox, check permissions"
|
||||
msgstr "Impossible de renommer la boite aux lettres, vérifier les permissions."
|
||||
|
||||
#: admin/views.py:295 admin/views.py:326
|
||||
#: admin/views.py:296 admin/views.py:326
|
||||
msgid "Alias with this name already exists"
|
||||
msgstr "Un alias avec ce nom existe déjà"
|
||||
|
||||
@@ -317,23 +317,23 @@ msgid "Path to the PDP server socket (if unix mode)"
|
||||
msgstr "Emplacement de la socket du serveur PDP (en mode unix)"
|
||||
|
||||
#: extensions/amavis_quarantine/main.py:50
|
||||
#: extensions/amavis_quarantine/templates/index.html:137
|
||||
#: extensions/amavis_quarantine/templates/index.html:130
|
||||
msgid "Quarantine"
|
||||
msgstr "Quarantaine"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:14
|
||||
#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:23
|
||||
#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:27
|
||||
msgid "From"
|
||||
msgstr "De"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:15
|
||||
#: extensions/webmail/forms.py:8 extensions/webmail/lib.py:21
|
||||
#: extensions/webmail/views.py:323 templates/common/email_searchbar.html:7
|
||||
#: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25
|
||||
#: extensions/webmail/views.py:332 templates/common/email_searchbar.html:7
|
||||
msgid "Subject"
|
||||
msgstr "Sujet"
|
||||
|
||||
#: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:24
|
||||
#: extensions/webmail/views.py:324
|
||||
#: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28
|
||||
#: extensions/webmail/views.py:333
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
@@ -355,11 +355,11 @@ msgid_plural "%(count)d messages released successfully"
|
||||
msgstr[0] "%(count)d message relâché correctement"
|
||||
msgstr[1] "%(count)d messages relâchés correctement"
|
||||
|
||||
#: extensions/amavis_quarantine/templates/index.html:90
|
||||
#: extensions/amavis_quarantine/templates/index.html:83
|
||||
msgid "Release this selection?"
|
||||
msgstr "Relâcher cette sélection?"
|
||||
|
||||
#: extensions/amavis_quarantine/templates/index.html:97
|
||||
#: extensions/amavis_quarantine/templates/index.html:90
|
||||
msgid "Delete this selection?"
|
||||
msgstr "Supprimer cette sélection?"
|
||||
|
||||
@@ -439,6 +439,10 @@ msgstr "Mauvais entête"
|
||||
msgid "Bad MIME"
|
||||
msgstr "Mauvais type MIME"
|
||||
|
||||
#: extensions/dummy_plugin/main.py:24
|
||||
msgid "Dummy"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/postfix_autoreply/forms.py:18
|
||||
msgid "This date is over"
|
||||
msgstr "Cette date est dépassée"
|
||||
@@ -576,7 +580,7 @@ msgstr "Année"
|
||||
msgid "Custom"
|
||||
msgstr "Personnalisée"
|
||||
|
||||
#: extensions/stats/views.py:74
|
||||
#: extensions/stats/views.py:66
|
||||
msgid "Bad custom period"
|
||||
msgstr "Mauvaise période personnalisée"
|
||||
|
||||
@@ -584,23 +588,23 @@ msgstr "Mauvaise période personnalisée"
|
||||
msgid "Global statistics"
|
||||
msgstr "Statistiques globales"
|
||||
|
||||
#: extensions/stats/templates/content.html:83
|
||||
#: extensions/stats/templates/content.html:84
|
||||
msgid "Domain:"
|
||||
msgstr "Domaine :"
|
||||
|
||||
#: extensions/stats/templates/content.html:85
|
||||
#: extensions/stats/templates/content.html:86
|
||||
msgid "Global"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/stats/templates/content.html:93
|
||||
#: extensions/stats/templates/content.html:94
|
||||
msgid "Period:"
|
||||
msgstr "Période :"
|
||||
|
||||
#: extensions/stats/templates/content.html:102
|
||||
#: extensions/stats/templates/content.html:103
|
||||
msgid "Start"
|
||||
msgstr "Démarrer"
|
||||
|
||||
#: extensions/stats/templates/content.html:104
|
||||
#: extensions/stats/templates/content.html:105
|
||||
msgid "End"
|
||||
msgstr "Fin"
|
||||
|
||||
@@ -624,11 +628,11 @@ msgstr "A"
|
||||
msgid "Cc"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/webmail/lib.py:177
|
||||
#: extensions/webmail/lib.py:184
|
||||
msgid "Connection to IMAP server failed, check your configuration"
|
||||
msgstr "La connexion au serveur IMAP a échoué, vérifiez votre configuration"
|
||||
|
||||
#: extensions/webmail/lib.py:181
|
||||
#: extensions/webmail/lib.py:188
|
||||
msgid "Authentication failed, check your configuration"
|
||||
msgstr "L'authentification a échoué, vérifiez votre configuration"
|
||||
|
||||
@@ -676,20 +680,19 @@ msgstr "Dossier de destination des copies de messages envoyés"
|
||||
msgid "Simple IMAP webmail"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:385
|
||||
#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:275
|
||||
msgid "Webmail"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/webmail/views.py:58
|
||||
#: extensions/webmail/templatetags/webextras.py:87
|
||||
msgid "Empty folder"
|
||||
msgstr "Vider ce dossier"
|
||||
#: extensions/webmail/views.py:58 lib/email_listing.py:124
|
||||
msgid "This folder contains no messages"
|
||||
msgstr "Ce dossier ne contient pas de messages"
|
||||
|
||||
#: extensions/webmail/views.py:304
|
||||
#: extensions/webmail/views.py:313
|
||||
msgid "wrote:"
|
||||
msgstr "a écrit :"
|
||||
|
||||
#: extensions/webmail/views.py:322
|
||||
#: extensions/webmail/views.py:331
|
||||
msgid "Original message"
|
||||
msgstr "Message original"
|
||||
|
||||
@@ -746,9 +749,13 @@ msgid "Actions"
|
||||
msgstr ""
|
||||
|
||||
#: extensions/webmail/templatetags/webextras.py:83
|
||||
msgid "Compact folder"
|
||||
msgid "Compress folder"
|
||||
msgstr "Compresser ce dossier"
|
||||
|
||||
#: extensions/webmail/templatetags/webextras.py:87
|
||||
msgid "Empty folder"
|
||||
msgstr "Vider ce dossier"
|
||||
|
||||
#: lib/__init__.py:63
|
||||
#, python-format
|
||||
msgid "Invalid action, %(user)s is a local user"
|
||||
@@ -921,11 +928,11 @@ msgstr "Dernière"
|
||||
msgid "Save"
|
||||
msgstr "Sauvegarder"
|
||||
|
||||
#: templates/registration/login.html:7
|
||||
#: templates/registration/login.html:8
|
||||
msgid "Welcome to MailNG"
|
||||
msgstr "Bienvenue dans MailNG"
|
||||
|
||||
#: templates/registration/login.html:27
|
||||
#: templates/registration/login.html:28
|
||||
msgid "Welcome"
|
||||
msgstr "Bienvenue"
|
||||
|
||||
@@ -954,4 +961,3 @@ msgstr "Nouveau mot de passe"
|
||||
#: userprefs/forms.py:26
|
||||
msgid "Old password mismatchs"
|
||||
msgstr "L'ancien mot de passe est incorrect"
|
||||
|
||||
|
||||
@@ -355,6 +355,15 @@ div.row label {
|
||||
color: #FF2A00;
|
||||
}
|
||||
|
||||
.info {
|
||||
background-color: #DAF8DA;
|
||||
color: #166D14;
|
||||
padding: 10px;
|
||||
width: 500px;
|
||||
text-align: center;
|
||||
margin: 50px auto;
|
||||
}
|
||||
|
||||
.errorlist ul {
|
||||
float: left;
|
||||
list-style: none;
|
||||
|
||||
@@ -54,7 +54,9 @@ window.addEvent("domready", function() {
|
||||
$("menubar").set("html", resp.menu);
|
||||
parse_menubar("menubar");
|
||||
}
|
||||
$("listing").set("html", resp.listing);
|
||||
if ($defined(resp.listing)) {
|
||||
$("listing").set("html", resp.listing);
|
||||
}
|
||||
if ($defined(resp.navbar)) {
|
||||
$("navbar").set("html", resp.navbar);
|
||||
$("navbar").getChildren("a").addEvent("click", navbarcallback);
|
||||
|
||||
Reference in New Issue
Block a user