Some great weekmail improvements

This commit is contained in:
Skia 2017-01-11 12:18:42 +01:00
parent 83555a3640
commit 147809bb5d
7 changed files with 297 additions and 129 deletions

View File

@ -6,9 +6,9 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h3>{% trans %}Weekmail{% endtrans %}</h3> <h3>{% trans %}Weekmail{% endtrans %} {{ object.id }}</h3>
<p><a href="{{ url('com:weekmail_preview') }}" target="_blank">{% trans %}Preview{% endtrans %}</a></p> <p><a href="{{ url('com:weekmail_preview') }}">{% trans %}Preview{% endtrans %}</a></p>
<p><a href="?send">{% trans %}Send{% endtrans %}</a></p> <p><a href="{{ url('com:weekmail_preview') }}?send=true">{% trans %}Send{% endtrans %}</a></p>
<h4>{% trans %}Articles in no weekmail yet{% endtrans %}</h4> <h4>{% trans %}Articles in no weekmail yet{% endtrans %}</h4>
<table> <table>
<thead> <thead>

View File

@ -6,6 +6,18 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<a href="{{ url('com:weekmail') }}">{% trans %}Back{% endtrans %}</a>
{% if request.GET['send'] %}
<p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
{% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
<p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
{% endif %}
<form method="post" action="">
{% csrf_token %}
<button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
</form>
{% endif %}
<hr>
{{ weekmail_rendered|safe }} {{ weekmail_rendered|safe }}
{% endblock %} {% endblock %}

View File

@ -1,4 +1,5 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponseRedirect
from django.views.generic import ListView, DetailView, RedirectView from django.views.generic import ListView, DetailView, RedirectView
from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic.edit import UpdateView, CreateView, DeleteView
from django.views.generic.detail import SingleObjectMixin from django.views.generic.detail import SingleObjectMixin
@ -231,10 +232,20 @@ class NewsDetailView(CanViewMixin, DetailView):
# Weekmail # Weekmail
class WeekmailPreviewView(DetailView): class WeekmailPreviewView(ComTabsMixin, DetailView):
model = Weekmail model = Weekmail
template_name = 'com/weekmail_preview.jinja' template_name = 'com/weekmail_preview.jinja'
success_url = reverse_lazy('com:weekmail') success_url = reverse_lazy('com:weekmail')
current_tab = "weekmail"
def post(self, request, *args, **kwargs):
self.object = self.get_object()
try:
if request.POST['send'] == "validate":
self.object.send()
return HttpResponseRedirect(reverse('com:weekmail') + "?qn_weekmail_send_success")
except: pass
return super(WeekmailEditView, self).get(request, *args, **kwargs)
def get_object(self, queryset=None): def get_object(self, queryset=None):
return self.model.objects.filter(sent=False).order_by('-id').first() return self.model.objects.filter(sent=False).order_by('-id').first()
@ -291,9 +302,6 @@ class WeekmailEditView(ComTabsMixin, QuickNotifMixin, UpdateView):
art.rank = -1 art.rank = -1
art.save() art.save()
self.quick_notif_list += ['qn_success'] self.quick_notif_list += ['qn_success']
if 'send' in request.GET.keys():
self.object.send()
self.quick_notif_list += ['qn_success']
return super(WeekmailEditView, self).get(request, *args, **kwargs) return super(WeekmailEditView, self).get(request, *args, **kwargs)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):

View File

@ -102,7 +102,7 @@
<ul id="quick_notif"> <ul id="quick_notif">
{% for n in quick_notifs %} {% for n in quick_notifs %}
<li>{{ n }}</li> <li>{{ n }}</li>
{% endfor %} {% endfor %}
</ul> </ul>

View File

@ -17,7 +17,7 @@ from django.utils import timezone
from datetime import timedelta, datetime, date from datetime import timedelta, datetime, date
import logging import logging
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, TabedViewMixin from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, TabedViewMixin, QuickNotifMixin
from core.views.forms import RegisteringForm, UserPropForm, UserProfileForm, LoginForm, UserGodfathersForm from core.views.forms import RegisteringForm, UserPropForm, UserProfileForm, LoginForm, UserGodfathersForm
from core.models import User, SithFile, Preferences from core.models import User, SithFile, Preferences
from club.models import Club from club.models import Club
@ -415,7 +415,7 @@ class UserUpdateGroupView(UserTabsMixin, CanEditPropMixin, UpdateView):
context_object_name = "profile" context_object_name = "profile"
current_tab = "groups" current_tab = "groups"
class UserToolsView(UserTabsMixin, TemplateView): class UserToolsView(QuickNotifMixin, UserTabsMixin, TemplateView):
""" """
Displays the logged user's tools Displays the logged user's tools
""" """

View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-10 23:29+0100\n" "POT-Creation-Date: 2017-01-11 12:17+0100\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
@ -64,7 +64,8 @@ msgid "account number"
msgstr "numero de compte" msgstr "numero de compte"
#: accounting/models.py:61 accounting/models.py:86 club/models.py:145 #: accounting/models.py:61 accounting/models.py:86 club/models.py:145
#: com/models.py:34 counter/models.py:104 counter/models.py:131 #: com/models.py:37 com/models.py:119 counter/models.py:104
#: counter/models.py:131
msgid "club" msgid "club"
msgstr "club" msgstr "club"
@ -124,8 +125,8 @@ msgstr "numéro"
msgid "journal" msgid "journal"
msgstr "classeur" msgstr "classeur"
#: accounting/models.py:194 core/models.py:517 core/models.py:862 #: accounting/models.py:194 core/models.py:528 core/models.py:873
#: core/models.py:902 counter/models.py:242 counter/models.py:290 #: core/models.py:913 counter/models.py:242 counter/models.py:290
#: counter/models.py:416 eboutic/models.py:15 eboutic/models.py:48 #: counter/models.py:416 eboutic/models.py:15 eboutic/models.py:48
msgid "date" msgid "date"
msgstr "date" msgstr "date"
@ -183,11 +184,12 @@ msgstr "Utilisateur"
#: accounting/models.py:207 club/templates/club/club_detail.jinja:5 #: accounting/models.py:207 club/templates/club/club_detail.jinja:5
#: com/templates/com/news_admin_list.jinja:17 #: com/templates/com/news_admin_list.jinja:17
#: com/templates/com/news_admin_list.jinja:51 #: com/templates/com/news_admin_list.jinja:51
#: com/templates/com/weekmail.jinja:17 com/templates/com/weekmail.jinja:40
#: counter/templates/counter/invoices_call.jinja:20 #: counter/templates/counter/invoices_call.jinja:20
msgid "Club" msgid "Club"
msgstr "Club" msgstr "Club"
#: accounting/models.py:207 core/views/user.py:179 #: accounting/models.py:207 core/views/user.py:184
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
@ -329,7 +331,7 @@ msgstr "Compte en banque : "
#: launderette/templates/launderette/launderette_admin.jinja:16 #: launderette/templates/launderette/launderette_admin.jinja:16
#: launderette/views.py:154 sas/templates/sas/album.jinja:26 #: launderette/views.py:154 sas/templates/sas/album.jinja:26
#: sas/templates/sas/moderation.jinja:18 sas/templates/sas/picture.jinja:66 #: sas/templates/sas/moderation.jinja:18 sas/templates/sas/picture.jinja:66
#: sas/templates/sas/picture.jinja:116 #: sas/templates/sas/picture.jinja.py:116
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
@ -356,9 +358,9 @@ msgstr "Nouveau compte club"
#: accounting/templates/accounting/journal_details.jinja:82 club/views.py:55 #: accounting/templates/accounting/journal_details.jinja:82 club/views.py:55
#: com/templates/com/news_admin_list.jinja:39 #: com/templates/com/news_admin_list.jinja:39
#: com/templates/com/news_admin_list.jinja:71 #: com/templates/com/news_admin_list.jinja:71
#: core/templates/core/file.jinja:38 core/templates/core/page.jinja:31 #: com/templates/com/weekmail.jinja:54 core/templates/core/file.jinja:38
#: core/templates/core/user_tools.jinja:38 core/views/user.py:152 #: core/templates/core/page.jinja:31 core/templates/core/user_tools.jinja:38
#: counter/templates/counter/cash_summary_list.jinja:53 #: core/views/user.py:152 counter/templates/counter/cash_summary_list.jinja:53
#: counter/templates/counter/counter_list.jinja:17 #: counter/templates/counter/counter_list.jinja:17
#: counter/templates/counter/counter_list.jinja:32 #: counter/templates/counter/counter_list.jinja:32
#: counter/templates/counter/counter_list.jinja:47 #: counter/templates/counter/counter_list.jinja:47
@ -454,6 +456,7 @@ msgstr "Fermé"
#: accounting/templates/accounting/journal_details.jinja:41 #: accounting/templates/accounting/journal_details.jinja:41
#: com/templates/com/news_admin_list.jinja:22 #: com/templates/com/news_admin_list.jinja:22
#: com/templates/com/news_admin_list.jinja:55 #: com/templates/com/news_admin_list.jinja:55
#: com/templates/com/weekmail.jinja:20 com/templates/com/weekmail.jinja:43
msgid "Actions" msgid "Actions"
msgstr "Actions" msgstr "Actions"
@ -469,8 +472,8 @@ msgstr "Non"
#: accounting/templates/accounting/club_account_details.jinja:54 #: accounting/templates/accounting/club_account_details.jinja:54
#: com/templates/com/news_admin_list.jinja:38 #: com/templates/com/news_admin_list.jinja:38
#: com/templates/com/news_admin_list.jinja:70 #: com/templates/com/news_admin_list.jinja:70 core/templates/core/file.jinja:36
#: core/templates/core/file.jinja:36 core/templates/core/page.jinja:28 #: core/templates/core/page.jinja:28
msgid "View" msgid "View"
msgstr "Voir" msgstr "Voir"
@ -659,10 +662,10 @@ msgid "Linked operation:"
msgstr "Opération liée : " msgstr "Opération liée : "
#: accounting/templates/accounting/operation_edit.jinja:51 #: accounting/templates/accounting/operation_edit.jinja:51
#: com/templates/com/news_edit.jinja:66 core/templates/core/create.jinja:12 #: com/templates/com/news_edit.jinja:66 com/templates/com/weekmail.jinja:66
#: core/templates/core/edit.jinja:7 core/templates/core/edit.jinja.py:15 #: core/templates/core/create.jinja:12 core/templates/core/edit.jinja:7
#: core/templates/core/edit.jinja:20 core/templates/core/file_edit.jinja:8 #: core/templates/core/edit.jinja.py:15 core/templates/core/edit.jinja:20
#: core/templates/core/page_prop.jinja:8 #: core/templates/core/file_edit.jinja:8 core/templates/core/page_prop.jinja:8
#: core/templates/core/pagerev_edit.jinja:24 #: core/templates/core/pagerev_edit.jinja:24
#: core/templates/core/user_godfathers.jinja:35 #: core/templates/core/user_godfathers.jinja:35
#: counter/templates/counter/cash_register_summary.jinja:22 #: counter/templates/counter/cash_register_summary.jinja:22
@ -826,8 +829,7 @@ msgstr "L'utilisateur est déjà membre de ce club"
msgid "past member" msgid "past member"
msgstr "Anciens membres" msgstr "Anciens membres"
#: club/templates/club/club_list.jinja:4 #: club/templates/club/club_list.jinja:4 club/templates/club/club_list.jinja:24
#: club/templates/club/club_list.jinja:24
msgid "Club list" msgid "Club list"
msgstr "Liste des clubs" msgstr "Liste des clubs"
@ -889,14 +891,13 @@ msgstr "Du"
msgid "To" msgid "To"
msgstr "Au" msgstr "Au"
#: club/templates/club/club_sellings.jinja:5 club/views.py:60 #: club/templates/club/club_sellings.jinja:5 club/views.py:60 club/views.py:221
#: club/views.py:221 counter/templates/counter/counter_main.jinja:19 #: counter/templates/counter/counter_main.jinja:19
#: counter/templates/counter/last_ops.jinja:35 #: counter/templates/counter/last_ops.jinja:35
msgid "Sellings" msgid "Sellings"
msgstr "Ventes" msgstr "Ventes"
#: club/templates/club/club_sellings.jinja:9 #: club/templates/club/club_sellings.jinja:9 club/templates/club/stats.jinja:19
#: club/templates/club/stats.jinja:19
#: counter/templates/counter/cash_summary_list.jinja:15 #: counter/templates/counter/cash_summary_list.jinja:15
msgid "Show" msgid "Show"
msgstr "Montrer" msgstr "Montrer"
@ -964,7 +965,7 @@ msgid "Payment method"
msgstr "Méthode de paiement" msgstr "Méthode de paiement"
#: club/templates/club/club_tools.jinja:4 #: club/templates/club/club_tools.jinja:4
#: core/templates/core/user_tools.jinja:82 #: core/templates/core/user_tools.jinja:84
msgid "Club tools" msgid "Club tools"
msgstr "Outils club" msgstr "Outils club"
@ -976,15 +977,19 @@ msgstr "Communication : "
msgid "Create a news" msgid "Create a news"
msgstr "Créer une nouvelle" msgstr "Créer une nouvelle"
#: club/templates/club/club_tools.jinja:10 #: club/templates/club/club_tools.jinja:9
msgid "Post in the Weekmail"
msgstr "Poster dans le Weekmail"
#: club/templates/club/club_tools.jinja:11
msgid "Counters:" msgid "Counters:"
msgstr "Comptoirs : " msgstr "Comptoirs : "
#: club/templates/club/club_tools.jinja:26 #: club/templates/club/club_tools.jinja:27
msgid "Accouting: " msgid "Accouting: "
msgstr "Comptabilité : " msgstr "Comptabilité : "
#: club/templates/club/club_tools.jinja:34 #: club/templates/club/club_tools.jinja:35
msgid "Manage launderettes" msgid "Manage launderettes"
msgstr "Gestion des laveries" msgstr "Gestion des laveries"
@ -1023,8 +1028,7 @@ msgstr "Vous n'avez pas la permission de faire cela"
msgid "Begin date" msgid "Begin date"
msgstr "Date de début" msgstr "Date de début"
#: club/views.py:170 com/views.py:81 counter/views.py:933 #: club/views.py:170 com/views.py:98 counter/views.py:933 election/views.py:131
#: election/views.py:131
msgid "End date" msgid "End date"
msgstr "Date de fin" msgstr "Date de fin"
@ -1033,84 +1037,115 @@ msgstr "Date de fin"
msgid "Product" msgid "Product"
msgstr "Produit" msgstr "Produit"
#: com/models.py:11 #: com/models.py:13
msgid "alert message" msgid "alert message"
msgstr "message d'alerte" msgstr "message d'alerte"
#: com/models.py:12 #: com/models.py:14
msgid "info message" msgid "info message"
msgstr "message d'info" msgstr "message d'info"
#: com/models.py:13 #: com/models.py:15
msgid "index page" msgid "index page"
msgstr "page d'accueil" msgstr "page d'accueil"
#: com/models.py:22 #: com/models.py:16
msgid "weekmail destinations"
msgstr "destinataires du weekmail"
#: com/models.py:25
msgid "Notice" msgid "Notice"
msgstr "Information" msgstr "Information"
#: com/models.py:23 #: com/models.py:26
msgid "Event" msgid "Event"
msgstr "Événement" msgstr "Événement"
#: com/models.py:24 com/templates/com/news_list.jinja:79 #: com/models.py:27 com/templates/com/news_list.jinja:79
msgid "Weekly" msgid "Weekly"
msgstr "Hebdomadaire" msgstr "Hebdomadaire"
#: com/models.py:25 #: com/models.py:28
msgid "Call" msgid "Call"
msgstr "Appel" msgstr "Appel"
#: com/models.py:30 election/models.py:14 election/models.py:81 #: com/models.py:33 com/models.py:75 com/models.py:116 election/models.py:14
#: election/models.py:118 #: election/models.py:81 election/models.py:118
msgid "title" msgid "title"
msgstr "titre" msgstr "titre"
#: com/models.py:31 #: com/models.py:34
msgid "summary" msgid "summary"
msgstr "résumé" msgstr "résumé"
#: com/models.py:32 #: com/models.py:35 com/models.py:117
msgid "content" msgid "content"
msgstr "contenu de la nouvelle" msgstr "contenu de la nouvelle"
#: com/models.py:33 core/models.py:901 launderette/models.py:60 #: com/models.py:36 core/models.py:912 launderette/models.py:60
#: launderette/models.py:85 launderette/models.py:121 #: launderette/models.py:85 launderette/models.py:121
msgid "type" msgid "type"
msgstr "type" msgstr "type"
#: com/models.py:35 #: com/models.py:38 com/models.py:118
msgid "author" msgid "author"
msgstr "auteur" msgstr "auteur"
#: com/models.py:36 core/models.py:518 #: com/models.py:39 core/models.py:529
msgid "is moderated" msgid "is moderated"
msgstr "est modéré" msgstr "est modéré"
#: com/models.py:37 #: com/models.py:40
msgid "moderator" msgid "moderator"
msgstr "modérateur" msgstr "modérateur"
#: com/models.py:61 #: com/models.py:64
msgid "news_date" msgid "news_date"
msgstr "date de la nouvelle" msgstr "date de la nouvelle"
#: com/models.py:62 #: com/models.py:65
msgid "start_date" msgid "start_date"
msgstr "date de début" msgstr "date de début"
#: com/models.py:63 #: com/models.py:66
msgid "end_date" msgid "end_date"
msgstr "date de fin" msgstr "date de fin"
#: com/models.py:76
msgid "intro"
msgstr "intro"
#: com/models.py:77
msgid "joke"
msgstr "blague"
#: com/models.py:78
msgid "protip"
msgstr "astuce"
#: com/models.py:79
msgid "conclusion"
msgstr "conclusion"
#: com/models.py:80
msgid "sent"
msgstr "envoyé"
#: com/models.py:115
msgid "weekmail"
msgstr "weekmail"
#: com/models.py:120
msgid "rank"
msgstr "rang"
#: com/templates/com/news_admin_list.jinja:5 #: com/templates/com/news_admin_list.jinja:5
msgid "News admin" msgid "News admin"
msgstr "Administration des nouvelles" msgstr "Administration des nouvelles"
#: com/templates/com/news_admin_list.jinja:9 #: com/templates/com/news_admin_list.jinja:9
#: com/templates/com/news_detail.jinja:5 #: com/templates/com/news_detail.jinja:5 com/templates/com/news_detail.jinja:11
#: com/templates/com/news_detail.jinja:11 com/templates/com/news_list.jinja:4 #: com/templates/com/news_list.jinja:4 com/templates/com/news_list.jinja:28
#: com/templates/com/news_list.jinja:28
msgid "News" msgid "News"
msgstr "Nouvelles" msgstr "Nouvelles"
@ -1127,6 +1162,7 @@ msgstr "Type"
#: com/templates/com/news_admin_list.jinja:15 #: com/templates/com/news_admin_list.jinja:15
#: com/templates/com/news_admin_list.jinja:49 #: com/templates/com/news_admin_list.jinja:49
#: com/templates/com/weekmail.jinja:18 com/templates/com/weekmail.jinja:41
msgid "Title" msgid "Title"
msgstr "Titre" msgstr "Titre"
@ -1137,6 +1173,7 @@ msgstr "Résumé"
#: com/templates/com/news_admin_list.jinja:18 #: com/templates/com/news_admin_list.jinja:18
#: com/templates/com/news_admin_list.jinja:52 #: com/templates/com/news_admin_list.jinja:52
#: com/templates/com/weekmail.jinja:16 com/templates/com/weekmail.jinja:39
msgid "Author" msgid "Author"
msgstr "Auteur" msgstr "Auteur"
@ -1203,7 +1240,7 @@ msgstr ""
"Appel : événement de longue durée, associé à une longue date (candidature, " "Appel : événement de longue durée, associé à une longue date (candidature, "
"concours, ...)" "concours, ...)"
#: com/templates/com/news_edit.jinja:65 #: com/templates/com/news_edit.jinja:65 com/templates/com/weekmail.jinja:10
#: core/templates/core/pagerev_edit.jinja:23 #: core/templates/core/pagerev_edit.jinja:23
msgid "Preview" msgid "Preview"
msgstr "Prévisualiser" msgstr "Prévisualiser"
@ -1216,38 +1253,126 @@ msgstr "Événement aujourd'hui et dans les prochains jours"
msgid "Coming soon... don't miss!" msgid "Coming soon... don't miss!"
msgstr "Prochainement... à ne pas rater!" msgstr "Prochainement... à ne pas rater!"
#: com/views.py:27 #: com/templates/com/weekmail.jinja:5 com/templates/com/weekmail.jinja.py:9
#: com/views.py:36 core/templates/core/user_tools.jinja:69
msgid "Weekmail"
msgstr "Weekmail"
#: com/templates/com/weekmail.jinja:11
#: com/templates/com/weekmail_preview.jinja:17
msgid "Send"
msgstr "Envoyer"
#: com/templates/com/weekmail.jinja:12
msgid "Articles in no weekmail yet"
msgstr "Articles dans aucun weekmail"
#: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:42
msgid "Content"
msgstr "Contenu"
#: com/templates/com/weekmail.jinja:30
msgid "Add to weekmail"
msgstr "Ajouter au Weekmail"
#: com/templates/com/weekmail.jinja:35
msgid "Articles included the next weekmail"
msgstr "Article inclus dans le prochain Weekmail"
#: com/templates/com/weekmail.jinja:55
msgid "Delete from weekmail"
msgstr "Supprimer du Weekmail"
#: com/templates/com/weekmail.jinja:56
msgid "Up"
msgstr "Monter"
#: com/templates/com/weekmail.jinja:57
msgid "Down"
msgstr "Descendre"
#: com/templates/com/weekmail_preview.jinja:9
#: core/templates/core/user_account_detail.jinja:11
#: core/templates/core/user_account_detail.jinja:104 launderette/views.py:154
msgid "Back"
msgstr "Retour"
#: com/templates/com/weekmail_preview.jinja:11
msgid "Are you sure you want to send this weekmail?"
msgstr "Êtes-vous sûr de vouloir envoyer ce Weekmail ?"
#: com/templates/com/weekmail_preview.jinja:13
msgid ""
"Warning: you are sending the weekmail in another language than the default "
"one!"
msgstr ""
"Attention : vous allez envoyer le Weekmail dans un langage différent de celui par défaut !"
#: com/templates/com/weekmail_renderer_html.jinja:4
#: com/templates/com/weekmail_renderer_text.jinja:4
msgid "Intro"
msgstr "Intro"
#: com/templates/com/weekmail_renderer_html.jinja:8
#: com/templates/com/weekmail_renderer_text.jinja:8
msgid "Table of content"
msgstr "Sommaire"
#: com/templates/com/weekmail_renderer_html.jinja:21
#: com/templates/com/weekmail_renderer_text.jinja:19
msgid "Joke"
msgstr "Blague"
#: com/templates/com/weekmail_renderer_html.jinja:26
#: com/templates/com/weekmail_renderer_text.jinja:24
msgid "Pro tip"
msgstr "Astuce"
#: com/templates/com/weekmail_renderer_html.jinja:31
#: com/templates/com/weekmail_renderer_text.jinja:29
msgid "Final word"
msgstr "Le mot de la fin"
#: com/views.py:29
msgid "Communication administration" msgid "Communication administration"
msgstr "Administration de la communication" msgstr "Administration de la communication"
#: com/views.py:34 #: com/views.py:41 core/templates/core/user_tools.jinja:70
msgid "Weekmail destinations"
msgstr "Destinataires du Weekmail"
#: com/views.py:46
msgid "Index page" msgid "Index page"
msgstr "Page d'accueil" msgstr "Page d'accueil"
#: com/views.py:39 #: com/views.py:51
msgid "Info message" msgid "Info message"
msgstr "Message d'info" msgstr "Message d'info"
#: com/views.py:44 #: com/views.py:56
msgid "Alert message" msgid "Alert message"
msgstr "Message d'alerte" msgstr "Message d'alerte"
#: com/views.py:80 election/views.py:130 #: com/views.py:97 election/views.py:130
msgid "Start date" msgid "Start date"
msgstr "Date de début" msgstr "Date de début"
#: com/views.py:82 #: com/views.py:99
msgid "Until" msgid "Until"
msgstr "Jusqu'à" msgstr "Jusqu'à"
#: com/views.py:83 #: com/views.py:100
msgid "Automoderation" msgid "Automoderation"
msgstr "Automodération" msgstr "Automodération"
#: com/views.py:89 com/views.py:91 com/views.py:93 #: com/views.py:106 com/views.py:108 com/views.py:110
msgid "This field is required." msgid "This field is required."
msgstr "Ce champ est obligatoire." msgstr "Ce champ est obligatoire."
#: com/views.py:270
msgid "Weekmail of the "
msgstr "Weekmail du "
#: core/models.py:29 #: core/models.py:29
msgid "meta group status" msgid "meta group status"
msgstr "status du meta-groupe" msgstr "status du meta-groupe"
@ -1488,140 +1613,144 @@ msgid "Visitor"
msgstr "Visiteur" msgstr "Visiteur"
#: core/models.py:491 #: core/models.py:491
msgid "do you want to receive the weekmail"
msgstr "voulez-vous recevoir le Weekmail"
#: core/models.py:496
msgid "define if we show a users stats" msgid "define if we show a users stats"
msgstr "Definit si l'on montre les statistiques de l'utilisateur" msgstr "Definit si l'on montre les statistiques de l'utilisateur"
#: core/models.py:493 #: core/models.py:498
msgid "Show your account statistics to others" msgid "Show your account statistics to others"
msgstr "Montrez vos statistiques de compte aux autres" msgstr "Montrez vos statistiques de compte aux autres"
#: core/models.py:506 #: core/models.py:517
msgid "file name" msgid "file name"
msgstr "nom du fichier" msgstr "nom du fichier"
#: core/models.py:507 core/models.py:707 #: core/models.py:518 core/models.py:718
msgid "parent" msgid "parent"
msgstr "parent" msgstr "parent"
#: core/models.py:508 core/models.py:524 #: core/models.py:519 core/models.py:535
msgid "file" msgid "file"
msgstr "fichier" msgstr "fichier"
#: core/models.py:509 #: core/models.py:520
msgid "compressed file" msgid "compressed file"
msgstr "version allégée" msgstr "version allégée"
#: core/models.py:510 #: core/models.py:521
msgid "thumbnail" msgid "thumbnail"
msgstr "miniature" msgstr "miniature"
#: core/models.py:511 core/models.py:519 #: core/models.py:522 core/models.py:530
msgid "owner" msgid "owner"
msgstr "propriétaire" msgstr "propriétaire"
#: core/models.py:512 core/models.py:713 #: core/models.py:523 core/models.py:724
msgid "edit group" msgid "edit group"
msgstr "groupe d'édition" msgstr "groupe d'édition"
#: core/models.py:513 core/models.py:714 #: core/models.py:524 core/models.py:725
msgid "view group" msgid "view group"
msgstr "groupe de vue" msgstr "groupe de vue"
#: core/models.py:514 #: core/models.py:525
msgid "is folder" msgid "is folder"
msgstr "est un dossier" msgstr "est un dossier"
#: core/models.py:515 #: core/models.py:526
msgid "mime type" msgid "mime type"
msgstr "type mime" msgstr "type mime"
#: core/models.py:516 #: core/models.py:527
msgid "size" msgid "size"
msgstr "taille" msgstr "taille"
#: core/models.py:520 #: core/models.py:531
msgid "asked for removal" msgid "asked for removal"
msgstr "retrait demandé" msgstr "retrait demandé"
#: core/models.py:521 #: core/models.py:532
msgid "is in the SAS" msgid "is in the SAS"
msgstr "est dans le SAS" msgstr "est dans le SAS"
#: core/models.py:560 #: core/models.py:571
msgid "Character '/' not authorized in name" msgid "Character '/' not authorized in name"
msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier" msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier"
#: core/models.py:563 core/models.py:568 #: core/models.py:574 core/models.py:579
msgid "Loop in folder tree" msgid "Loop in folder tree"
msgstr "Boucle dans l'arborescence des dossiers" msgstr "Boucle dans l'arborescence des dossiers"
#: core/models.py:572 #: core/models.py:583
msgid "You can not make a file be a children of a non folder file" msgid "You can not make a file be a children of a non folder file"
msgstr "" msgstr ""
"Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas " "Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas "
"un dossier" "un dossier"
#: core/models.py:576 #: core/models.py:587
msgid "Duplicate file" msgid "Duplicate file"
msgstr "Un fichier de ce nom existe déjà" msgstr "Un fichier de ce nom existe déjà"
#: core/models.py:590 #: core/models.py:601
msgid "You must provide a file" msgid "You must provide a file"
msgstr "Vous devez fournir un fichier" msgstr "Vous devez fournir un fichier"
#: core/models.py:656 #: core/models.py:667
msgid "Folder: " msgid "Folder: "
msgstr "Dossier : " msgstr "Dossier : "
#: core/models.py:658 #: core/models.py:669
msgid "File: " msgid "File: "
msgstr "Fichier : " msgstr "Fichier : "
#: core/models.py:706 core/models.py:710 #: core/models.py:717 core/models.py:721
msgid "page name" msgid "page name"
msgstr "nom de la page" msgstr "nom de la page"
#: core/models.py:711 #: core/models.py:722
msgid "owner group" msgid "owner group"
msgstr "groupe propriétaire" msgstr "groupe propriétaire"
#: core/models.py:715 #: core/models.py:726
msgid "lock user" msgid "lock user"
msgstr "utilisateur bloquant" msgstr "utilisateur bloquant"
#: core/models.py:716 #: core/models.py:727
msgid "lock_timeout" msgid "lock_timeout"
msgstr "décompte du déblocage" msgstr "décompte du déblocage"
#: core/models.py:743 #: core/models.py:754
msgid "Duplicate page" msgid "Duplicate page"
msgstr "Une page de ce nom existe déjà" msgstr "Une page de ce nom existe déjà"
#: core/models.py:749 #: core/models.py:760
msgid "Loop in page tree" msgid "Loop in page tree"
msgstr "Boucle dans l'arborescence des pages" msgstr "Boucle dans l'arborescence des pages"
#: core/models.py:859 #: core/models.py:870
msgid "revision" msgid "revision"
msgstr "révision" msgstr "révision"
#: core/models.py:860 #: core/models.py:871
msgid "page title" msgid "page title"
msgstr "titre de la page" msgstr "titre de la page"
#: core/models.py:861 #: core/models.py:872
msgid "page content" msgid "page content"
msgstr "contenu de la page" msgstr "contenu de la page"
#: core/models.py:899 #: core/models.py:910
msgid "url" msgid "url"
msgstr "url" msgstr "url"
#: core/models.py:900 #: core/models.py:911
msgid "param" msgid "param"
msgstr "param" msgstr "param"
#: core/models.py:903 #: core/models.py:914
msgid "viewed" msgid "viewed"
msgstr "vue" msgstr "vue"
@ -1705,27 +1834,27 @@ msgstr "Partenaires"
msgid "Help" msgid "Help"
msgstr "Aide" msgstr "Aide"
#: core/templates/core/base.jinja:131 #: core/templates/core/base.jinja:137
msgid "Contacts" msgid "Contacts"
msgstr "Contacts" msgstr "Contacts"
#: core/templates/core/base.jinja:132 #: core/templates/core/base.jinja:138
msgid "Legal notices" msgid "Legal notices"
msgstr "Mentions légales" msgstr "Mentions légales"
#: core/templates/core/base.jinja:133 #: core/templates/core/base.jinja:139
msgid "Intellectual property" msgid "Intellectual property"
msgstr "Propriété intellectuelle" msgstr "Propriété intellectuelle"
#: core/templates/core/base.jinja:134 #: core/templates/core/base.jinja:140
msgid "Help & Documentation" msgid "Help & Documentation"
msgstr "Aide & Documentation" msgstr "Aide & Documentation"
#: core/templates/core/base.jinja:135 #: core/templates/core/base.jinja:141
msgid "R&D" msgid "R&D"
msgstr "R&D" msgstr "R&D"
#: core/templates/core/base.jinja:137 #: core/templates/core/base.jinja:143
msgid "Site made by good people" msgid "Site made by good people"
msgstr "Site réalisé par des gens bons" msgstr "Site réalisé par des gens bons"
@ -1896,13 +2025,11 @@ msgstr "login"
msgid "Lost password?" msgid "Lost password?"
msgstr "Mot de passe perdu ?" msgstr "Mot de passe perdu ?"
#: core/templates/core/macros.jinja:27 #: core/templates/core/macros.jinja:27 core/templates/core/user_detail.jinja:27
#: core/templates/core/user_detail.jinja:27
msgid "Born: " msgid "Born: "
msgstr "Né le : " msgstr "Né le : "
#: core/templates/core/macros.jinja:31 #: core/templates/core/macros.jinja:31 core/templates/core/user_detail.jinja:48
#: core/templates/core/user_detail.jinja:48
msgid "Promo: " msgid "Promo: "
msgstr "Promo : " msgstr "Promo : "
@ -2123,7 +2250,7 @@ msgstr "Résultat de la recherche"
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: core/templates/core/search.jinja:18 core/views/user.py:158 #: core/templates/core/search.jinja:18 core/views/user.py:163
#: counter/templates/counter/stats.jinja:17 #: counter/templates/counter/stats.jinja:17
msgid "Clubs" msgid "Clubs"
msgstr "Clubs" msgstr "Clubs"
@ -2174,11 +2301,6 @@ msgstr "Etickets"
msgid "User has no account" msgid "User has no account"
msgstr "L'utilisateur n'a pas de compte" msgstr "L'utilisateur n'a pas de compte"
#: core/templates/core/user_account_detail.jinja:11
#: core/templates/core/user_account_detail.jinja:104 launderette/views.py:154
msgid "Back"
msgstr "Retour"
#: core/templates/core/user_account_detail.jinja:79 #: core/templates/core/user_account_detail.jinja:79
msgid "Items" msgid "Items"
msgstr "Articles" msgstr "Articles"
@ -2328,7 +2450,7 @@ msgstr "Outils utilisateurs"
msgid "Sith management" msgid "Sith management"
msgstr "Gestion de Sith" msgstr "Gestion de Sith"
#: core/templates/core/user_tools.jinja:14 core/views/user.py:164 #: core/templates/core/user_tools.jinja:14 core/views/user.py:169
msgid "Groups" msgid "Groups"
msgstr "Groupes" msgstr "Groupes"
@ -2372,7 +2494,7 @@ msgstr "Relevés de caisse"
msgid "Invoices call" msgid "Invoices call"
msgstr "Appels à facture" msgstr "Appels à facture"
#: core/templates/core/user_tools.jinja:39 core/views/user.py:174 #: core/templates/core/user_tools.jinja:39 core/views/user.py:179
#: counter/templates/counter/counter_list.jinja:18 #: counter/templates/counter/counter_list.jinja:18
#: counter/templates/counter/counter_list.jinja:33 #: counter/templates/counter/counter_list.jinja:33
#: counter/templates/counter/counter_list.jinja:48 #: counter/templates/counter/counter_list.jinja:48
@ -2395,39 +2517,39 @@ msgstr "Compte club : "
msgid "Communication" msgid "Communication"
msgstr "Communication" msgstr "Communication"
#: core/templates/core/user_tools.jinja:69 #: core/templates/core/user_tools.jinja:71
msgid "Moderate news" msgid "Moderate news"
msgstr "Modérer les nouvelles" msgstr "Modérer les nouvelles"
#: core/templates/core/user_tools.jinja:70 #: core/templates/core/user_tools.jinja:72
msgid "Edit index page" msgid "Edit index page"
msgstr "Éditer la page d'accueil" msgstr "Éditer la page d'accueil"
#: core/templates/core/user_tools.jinja:71 #: core/templates/core/user_tools.jinja:73
msgid "Edit alert message" msgid "Edit alert message"
msgstr "Éditer le message d'alerte" msgstr "Éditer le message d'alerte"
#: core/templates/core/user_tools.jinja:72 #: core/templates/core/user_tools.jinja:74
msgid "Edit information message" msgid "Edit information message"
msgstr "Éditer le message d'informations" msgstr "Éditer le message d'informations"
#: core/templates/core/user_tools.jinja:73 #: core/templates/core/user_tools.jinja:75
msgid "Moderate files" msgid "Moderate files"
msgstr "Modérer les fichiers" msgstr "Modérer les fichiers"
#: core/templates/core/user_tools.jinja:76 #: core/templates/core/user_tools.jinja:78
msgid "Moderate pictures" msgid "Moderate pictures"
msgstr "Modérer les photos" msgstr "Modérer les photos"
#: core/templates/core/user_tools.jinja:89 #: core/templates/core/user_tools.jinja:91
msgid "Elections" msgid "Elections"
msgstr "Élections" msgstr "Élections"
#: core/templates/core/user_tools.jinja:91 #: core/templates/core/user_tools.jinja:93
msgid "See available elections" msgid "See available elections"
msgstr "Voir les élections disponibles" msgstr "Voir les élections disponibles"
#: core/templates/core/user_tools.jinja:93 #: core/templates/core/user_tools.jinja:95
msgid "Create a new election" msgid "Create a new election"
msgstr "Créer une nouvelle élection" msgstr "Créer une nouvelle élection"
@ -2490,7 +2612,11 @@ msgstr "Fillot"
msgid "Pictures" msgid "Pictures"
msgstr "Photos" msgstr "Photos"
#: core/views/user.py:312 #: core/views/user.py:157
msgid "Preferences"
msgstr "Préférences"
#: core/views/user.py:317
msgid "User already has a profile picture" msgid "User already has a profile picture"
msgstr "L'utilisateur a déjà une photo de profil" msgstr "L'utilisateur a déjà une photo de profil"
@ -2925,6 +3051,7 @@ msgid "Percentage"
msgstr "Pourcentage" msgstr "Pourcentage"
#: counter/templates/counter/stats.jinja:47 #: counter/templates/counter/stats.jinja:47
#, python-format
msgid "Top 100 barman %(counter_name)s" msgid "Top 100 barman %(counter_name)s"
msgstr "Top 100 barman %(counter_name)s" msgstr "Top 100 barman %(counter_name)s"
@ -2934,6 +3061,7 @@ msgid "Time"
msgstr "Temps" msgstr "Temps"
#: counter/templates/counter/stats.jinja:72 #: counter/templates/counter/stats.jinja:72
#, python-format
msgid "Top 100 barman %(counter_name)s (all semesters)" msgid "Top 100 barman %(counter_name)s (all semesters)"
msgstr "Top 100 barman %(counter_name)s (tous les semestres)" msgstr "Top 100 barman %(counter_name)s (tous les semestres)"
@ -3677,6 +3805,26 @@ msgstr "Vous avez acheté %s"
msgid "You have a notification" msgid "You have a notification"
msgstr "Vous avez une notification" msgstr "Vous avez une notification"
#: sith/settings.py:470
msgid "Success!"
msgstr "Succès !"
#: sith/settings.py:471
msgid "Fail!"
msgstr "Échec !"
#: sith/settings.py:472
msgid "You successfully posted an article in the Weekmail"
msgstr "Article posté avec succès dans le Weekmail"
#: sith/settings.py:473
msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:474
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: subscription/models.py:16 #: subscription/models.py:16
msgid "Bad subscription type" msgid "Bad subscription type"
msgstr "Mauvais type de cotisation" msgstr "Mauvais type de cotisation"
@ -3717,4 +3865,3 @@ msgstr "Un utilisateur avec cette adresse email existe déjà"
msgid "You must either choose an existing user or create a new one properly" msgid "You must either choose an existing user or create a new one properly"
msgstr "" msgstr ""
"Vous devez soit choisir un utilisateur existant, soit en créer un proprement" "Vous devez soit choisir un utilisateur existant, soit en créer un proprement"

View File

@ -471,6 +471,7 @@ SITH_QUICK_NOTIF = {
'qn_fail': _("Fail!"), 'qn_fail': _("Fail!"),
'qn_weekmail_new_article': _("You successfully posted an article in the Weekmail"), 'qn_weekmail_new_article': _("You successfully posted an article in the Weekmail"),
'qn_weekmail_article_edit': _("You successfully edited an article in the Weekmail"), 'qn_weekmail_article_edit': _("You successfully edited an article in the Weekmail"),
'qn_weekmail_send_success': _("You successfully sent the Weekmail"),
} }
try: try: