diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index 6f335b9b..69c2beb8 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -26,7 +26,7 @@ section.news_event:nth-child(even) { {% block content %}

{% trans %}News{% endtrans %}


-

Notice

+

{% trans %}Notice{% endtrans %}

{% for news in object_list.filter(type="NOTICE") %}

{{ news.title }}

@@ -34,7 +34,7 @@ section.news_event:nth-child(even) {
{% endfor %}
-

Calls

+

{% trans %}Calls{% endtrans %}

{% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %}

{{ news.title }}

@@ -48,7 +48,7 @@ section.news_event:nth-child(even) {
{% endfor %}
-

Events

+

{% trans %}Events{% endtrans %}

{% for news in object_list.filter(dates__end_date__gte=timezone.now(), type="EVENT") %}

{{ news.title }}

@@ -63,7 +63,7 @@ section.news_event:nth-child(even) {
{% endfor %}
-

Weekly

+

{% trans %}Weekly{% endtrans %}

{% for news in object_list.filter(dates__end_date__gte=timezone.now(), type="WEEKLY").distinct() %} {% for d in news.dates.all() %} diff --git a/com/views.py b/com/views.py index 88f94b1d..9f0b8e70 100644 --- a/com/views.py +++ b/com/views.py @@ -1,7 +1,7 @@ from django.shortcuts import render from django.views.generic import ListView, DetailView, RedirectView from django.views.generic.edit import UpdateView, CreateView -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse, reverse_lazy from django.core.exceptions import ValidationError from django.utils import timezone diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 065ffb43..15150033 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-21 05:22+0100\n" +"POT-Creation-Date: 2016-12-23 03:16+0100\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -64,7 +64,7 @@ msgid "account number" msgstr "numero de compte" #: accounting/models.py:61 accounting/models.py:86 club/models.py:145 -#: counter/models.py:104 counter/models.py:131 +#: com/models.py:34 counter/models.py:104 counter/models.py:131 msgid "club" msgstr "club" @@ -253,7 +253,7 @@ msgstr "Crédit" #: accounting/models.py:300 #: accounting/templates/accounting/journal_statement_nature.jinja:27 -#: accounting/templates/accounting/journal_statement_person.jinja:37 +#: accounting/templates/accounting/journal_statement_person.jinja:39 #: accounting/views.py:417 msgid "Debit" msgstr "Débit" @@ -347,9 +347,9 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/bank_account_list.jinja:21 #: accounting/templates/accounting/club_account_details.jinja:55 #: accounting/templates/accounting/journal_details.jinja:73 club/views.py:54 -#: core/templates/core/file.jinja:38 core/templates/core/page.jinja:31 -#: core/templates/core/user_tools.jinja:38 core/views/user.py:152 -#: counter/templates/counter/cash_summary_list.jinja:53 +#: com/templates/com/news_admin_list.jinja:17 core/templates/core/file.jinja:38 +#: core/templates/core/page.jinja:31 core/templates/core/user_tools.jinja:38 +#: 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:32 #: counter/templates/counter/counter_list.jinja:47 @@ -569,7 +569,7 @@ msgstr "Type d'opération" #: accounting/templates/accounting/journal_statement_nature.jinja:13 #: accounting/templates/accounting/journal_statement_nature.jinja:32 #: accounting/templates/accounting/journal_statement_person.jinja:17 -#: accounting/templates/accounting/journal_statement_person.jinja:43 +#: accounting/templates/accounting/journal_statement_person.jinja:45 #: counter/templates/counter/invoices_call.jinja:21 msgid "Sum" msgstr "Somme" @@ -597,7 +597,7 @@ msgid "Statement by person: " msgstr "Bilan par personne : " #: accounting/templates/accounting/journal_statement_person.jinja:16 -#: accounting/templates/accounting/journal_statement_person.jinja:42 +#: accounting/templates/accounting/journal_statement_person.jinja:44 msgid "Target of the operation" msgstr "Cible de l'opération" @@ -616,9 +616,10 @@ msgid "Edit operation" msgstr "Éditer l'opération" #: accounting/templates/accounting/operation_edit.jinja:41 -#: core/templates/core/create.jinja:12 core/templates/core/edit.jinja:7 -#: core/templates/core/edit.jinja.py:15 core/templates/core/edit.jinja:20 -#: core/templates/core/file_edit.jinja:8 core/templates/core/page_prop.jinja:8 +#: com/templates/com/news_edit.jinja:29 core/templates/core/create.jinja:12 +#: core/templates/core/edit.jinja:7 core/templates/core/edit.jinja.py:15 +#: core/templates/core/edit.jinja:20 core/templates/core/file_edit.jinja:8 +#: core/templates/core/page_prop.jinja:8 #: core/templates/core/pagerev_edit.jinja:24 #: core/templates/core/user_godfathers.jinja:35 #: counter/templates/counter/cash_register_summary.jinja:22 @@ -628,7 +629,7 @@ msgstr "Sauver" #: accounting/templates/accounting/refound_account.jinja:4 #: accounting/templates/accounting/refound_account.jinja:8 -#: accounting/views.py:688 +#: accounting/views.py:680 msgid "Refound account" msgstr "Remboursement de compte" @@ -709,15 +710,15 @@ msgstr "Commentaire :" msgid "Signature:" msgstr "Signature :" -#: accounting/views.py:504 +#: accounting/views.py:506 msgid "General statement" msgstr "Bilan général" -#: accounting/views.py:507 +#: accounting/views.py:509 msgid "No label operations" msgstr "Opérations sans étiquette" -#: accounting/views.py:650 +#: accounting/views.py:642 msgid "Refound this account" msgstr "Rembourser ce compte" @@ -959,7 +960,7 @@ msgstr "Vous n'avez pas la permission de faire cela" msgid "Begin date" msgstr "Date de début" -#: club/views.py:166 counter/views.py:909 +#: club/views.py:166 com/views.py:78 counter/views.py:909 msgid "End date" msgstr "Date de fin" @@ -968,34 +969,125 @@ msgstr "Date de fin" msgid "Product" msgstr "Produit" -#: com/models.py:6 +#: com/models.py:11 msgid "alert message" msgstr "message d'alerte" -#: com/models.py:7 +#: com/models.py:12 msgid "info message" msgstr "message d'info" -#: com/models.py:8 +#: com/models.py:13 msgid "index page" msgstr "page d'accueil" -#: com/views.py:14 +#: com/models.py:22 com/templates/com/news_list.jinja:29 +msgid "Notice" +msgstr "Notification" + +#: com/models.py:23 +msgid "Event" +msgstr "Événement" + +#: com/models.py:24 com/templates/com/news_list.jinja:66 +msgid "Weekly" +msgstr "Hebdomadaire" + +#: com/models.py:25 +msgid "Call" +msgstr "Appel" + +#: com/models.py:30 +msgid "title" +msgstr "titre" + +#: com/models.py:31 +msgid "summary" +msgstr "résumé" + +#: com/models.py:32 +msgid "content" +msgstr "contenu de la nouvelle" + +#: com/models.py:33 core/models.py:914 launderette/models.py:60 +#: launderette/models.py:85 launderette/models.py:121 +msgid "type" +msgstr "type" + +#: com/models.py:35 com/models.py:37 core/models.py:524 core/models.py:532 +msgid "owner" +msgstr "propriétaire" + +#: com/models.py:36 core/models.py:531 +msgid "is moderated" +msgstr "est modéré" + +#: com/models.py:52 +msgid "news_date" +msgstr "date de la nouvelle" + +#: com/models.py:53 +msgid "start_date" +msgstr "date de début" + +#: com/models.py:54 +msgid "end_date" +msgstr "date de fin" + +#: com/templates/com/news_admin_list.jinja:4 +msgid "News admin" +msgstr "Administration des nouvelles" + +#: com/templates/com/news_admin_list.jinja:8 +#: com/templates/com/news_detail.jinja:4 com/templates/com/news_detail.jinja:9 +#: com/templates/com/news_list.jinja:4 com/templates/com/news_list.jinja:27 +msgid "News" +msgstr "Nouvelles" + +#: com/templates/com/news_edit.jinja:5 com/templates/com/news_edit.jinja:13 +msgid "Edit news" +msgstr "Éditer la nouvelle" + +#: com/templates/com/news_edit.jinja:7 com/templates/com/news_edit.jinja:15 +msgid "Create news" +msgstr "Créer nouvelle" + +#: com/templates/com/news_list.jinja:37 +msgid "Calls" +msgstr "Appels" + +#: com/templates/com/news_list.jinja:51 +msgid "Events" +msgstr "Événements" + +#: com/views.py:24 msgid "Communication administration" msgstr "Administration de la communication" -#: com/views.py:21 +#: com/views.py:31 msgid "Index page" msgstr "Page d'accueil" -#: com/views.py:26 +#: com/views.py:36 msgid "Info message" msgstr "Message d'info" -#: com/views.py:31 +#: com/views.py:41 msgid "Alert message" msgstr "Message d'alerte" +#: com/views.py:77 +msgid "Start date" +msgstr "Date de début" + +#: com/views.py:79 +msgid "Until" +msgstr "Jusqu'à" + +#: com/views.py:85 com/views.py:87 com/views.py:89 +msgid "This field is required." +msgstr "Ce champ est obligatoire." + #: core/models.py:29 msgid "meta group status" msgstr "status du meta-groupe" @@ -1314,10 +1406,6 @@ msgstr "version allégée" msgid "thumbnail" msgstr "miniature" -#: core/models.py:524 core/models.py:532 -msgid "owner" -msgstr "propriétaire" - #: core/models.py:525 core/models.py:726 msgid "edit group" msgstr "groupe d'édition" @@ -1338,10 +1426,6 @@ msgstr "type mime" msgid "size" msgstr "taille" -#: core/models.py:531 -msgid "is moderated" -msgstr "est modéré" - #: core/models.py:533 msgid "asked for removal" msgstr "retrait demandé" @@ -1424,11 +1508,6 @@ msgstr "url" msgid "param" msgstr "param" -#: core/models.py:914 launderette/models.py:60 launderette/models.py:85 -#: launderette/models.py:121 -msgid "type" -msgstr "type" - #: core/models.py:916 msgid "viewed" msgstr "vue" @@ -3291,4 +3370,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" msgstr "" "Vous devez soit choisir un utilisateur existant, soit en créer un proprement" -