Commit a09c3085 authored by Och's avatar Och
Browse files

Merge branch 'master' into 'och'

# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
parents bdde6316 f34f5fe6
Pipeline #2216 failed with stage
in 7 minutes and 2 seconds
......@@ -43,7 +43,7 @@
<div id="birthdays_content">
{% if user.is_subscribed %}
{# Cache request for 1 hour #}
{% cache 3600 birthdays %}
{% cache 3600 "birthdays" %}
<ul class="birthdays_year">
{% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
<li>
......
......@@ -59,7 +59,7 @@
</div>
<div id="header_bar">
<ul id="header_bars_infos">
{% cache 100 counters_activity %}
{% cache 100 "counters_activity" %}
{% for bar in Counter.objects.filter(type="BAR").all() %}
<li>
<a href="{{ url('counter:activity', counter_id=bar.id) }}" style="padding: 0px">
......
......@@ -1378,7 +1378,7 @@ msgid "History"
msgstr "Historique"
#: club/views.py:125 core/templates/core/base.jinja:118 core/views/user.py:219
#: sas/templates/sas/picture.jinja:95 trombi/views.py:63
#: sas/templates/sas/picture.jinja:95 trombi/views.py:61
msgid "Tools"
msgstr "Outils"
......@@ -4757,76 +4757,12 @@ msgid "Washing and drying"
msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:561
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:561
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:594
>>>>>>> 39dfb9e... Corrected conflicts
msgid "Washing"
msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:561
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:561
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:594
>>>>>>> 39dfb9e... Corrected conflicts
msgid "Drying"
msgstr "Séchage"
......@@ -5549,14 +5485,6 @@ msgid "One month for free"
msgstr "Un mois gratuit"
#: sith/settings.py:501
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "Two months for free"
msgstr "Deux mois gratuits"
......@@ -5565,8 +5493,6 @@ msgid "Six weeks for free"
msgstr "Six semaines gratuites"
#: sith/settings.py:507
<<<<<<< HEAD
<<<<<<< HEAD
msgid "Eurock's volunteer"
msgstr "Bénévole Eurockéennes"
......@@ -5575,107 +5501,29 @@ msgid "One day"
msgstr "Un jour"
#: sith/settings.py:509
=======
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "Eurock's volunteer"
msgstr "Bénévole Eurockéennes"
#: sith/settings.py:508
msgid "One day"
msgstr "Un jour"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:503
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:509
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "GA staff member"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
msgstr "Membre staff GA (2 semaines), 1 €"
=======
msgstr "Membre staff GA (2 semaines)"
>>>>>>> 7d321cf... locale: Added duration in the subscription title
=======
msgstr "Membre staff GA, 1 €"
>>>>>>> 0f3d796... locale: Added price in the subscription title
=======
msgstr "Membre staff GA (2 semaines), 1 €"
>>>>>>> a68c74f... locale: Added traduction for the new subscription
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:512
=======
=======
>>>>>>> 797ca0f... settings: Added a new subscription
#: sith/settings.py:508
msgid "GA staff member"
msgstr "Membre staff GA (2 semaines), 1 €"
#: sith/settings.py:511
<<<<<<< HEAD
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:517
=======
#: sith/settings.py:516
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:516
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Two semesters (-20%)"
msgstr "Deux semestres, 35 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:522
=======
#: sith/settings.py:521
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:521
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun, 60 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:527
=======
#: sith/settings.py:526
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:526
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Branch cursus (-20%)"
msgstr "Cursus branche, 60 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:532
=======
#: sith/settings.py:531
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:531
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant, 30 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:554
msgid "President"
msgstr "Président"
......@@ -5716,379 +5564,38 @@ msgstr "Curieux"
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
<<<<<<< HEAD
#: sith/settings.py:599
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:602
=======
#: sith/settings.py:521
=======
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:512
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
#: sith/settings.py:517
msgid "Two semesters (-20%)"
msgstr "Deux semestres, 35 €"
#: sith/settings.py:522
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun, 60 €"
#: sith/settings.py:527
msgid "Branch cursus (-20%)"
msgstr "Cursus branche, 60 €"
#: sith/settings.py:532
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant, 30 €"
#: sith/settings.py:554
msgid "President"
msgstr "Président"
#: sith/settings.py:555
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:556
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:557
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:558
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:559
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:560
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:561
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:562
msgid "Curious"
msgstr "Curieux"
#: sith/settings.py:598
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:599
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list à besoin d'être modérée"
#: sith/settings.py:602
<<<<<<< HEAD
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:553
msgid "President"
msgstr "Président"
#: sith/settings.py:554
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:555
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:556
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:557
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:558
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:559
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:560
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:561
msgid "Curious"
msgstr "Curieux"
#: sith/settings.py:597
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:598
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:601
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "A new pedagogy comment has been signaled for moderation"
msgstr ""
"Un nouveau commentaire de la pédagogie a été signalé pour la modération"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:604
=======
#: sith/settings.py:603
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:571
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:604
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:603
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:571
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
msgstr "Un nouveau commentaire de la pédagogie a été signalé pour la modération"
#: sith/settings.py:604
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:603
>>>>>>> 797ca0f... settings: Added a new subscription
#, python-format
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles toutes fraîches à modérer"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
=======
#: sith/settings.py:604
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:605
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:572
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:573
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
=======
msgid "A new pedagogy comment has been signaled for moderation"
msgstr "Un nouveau commentaire d'UV à besoin d'être modéré"
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:604
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles à modérer"
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
<<<<<<< HEAD
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:604
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:605
>>>>>>> 797ca0f... settings: Added a new subscription
=======
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "There are %s pictures to be moderated in the SAS"
msgstr "Il y a %s photos à modérer dans le SAS"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:607
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
<<<<<<< HEAD
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:607
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:574
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:575
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:607
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:607
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:574
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:575
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:607
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:607
>>>>>>> 797ca0f... settings: Added a new subscription
=======
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "You just refilled of %s €"
msgstr "Vous avez rechargé votre compte de %s€"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:609
=======
#: sith/settings.py:608
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:576
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:609
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:608
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:576
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:609
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:608
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:609
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "You just bought %s"
msgstr "Vous avez acheté %s"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:610
msgid "You have a notification"
msgstr "Vous avez une notification"
#: sith/settings.py:622
msgid "Success!"
msgstr "Succès !"
#: sith/settings.py:623
msgid "Fail!"
msgstr "Échec !"
#: sith/settings.py:624
msgid "You successfully posted an article in the Weekmail"
msgstr "Article posté avec succès dans le Weekmail"
#: sith/settings.py:625
msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:626
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:634
<<<<<<< HEAD
=======
#: sith/settings.py:609
=======
#: sith/settings.py:577
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:610
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "You have a notification"
msgstr "Vous avez une notification"