klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-02 12:59:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: klmp200:6a586020f1d5f6f6492a92b6423c5ac44d9f35bd
Branches Tags
klmp200:master
klmp200:dependabot/pip/taiste/phonenumbers-8.13.26
klmp200:features/migrate-from-xapian-to-elasticsearch
klmp200:dependabot/pip/django-3.2.23
klmp200:dependabot/pip/urllib3-1.26.18
klmp200:taiste
klmp200:dependabot/pip/taiste/django-phonenumber-field-7.2.0
klmp200:dependabot/pip/pillow-10.0.1
klmp200:dependabot/pip/taiste/coverage-7.3.2
klmp200:dependabot/pip/taiste/ipython-8.12.3
klmp200:dependabot/pip/reportlab-3.6.13
klmp200:fix/license
klmp200:dependabot/pip/certifi-2023.7.22
klmp200:dependabot/pip/pygments-2.15.0
klmp200:dependabot/pip/requests-2.31.0
klmp200:feature/improved-header-buttons
klmp200:dependabot/pip/taiste/django-4.2.1
klmp200:feature/accounts-dump
klmp200:feature/account-dumping
klmp200:feature/easy_switch_weekmail_banner
..
compare: klmp200:2480644f1cde156390554f0e3f2ae2e77f4a4ba5
Branches Tags
klmp200:master
klmp200:dependabot/pip/taiste/phonenumbers-8.13.26
klmp200:features/migrate-from-xapian-to-elasticsearch
klmp200:dependabot/pip/django-3.2.23
klmp200:dependabot/pip/urllib3-1.26.18
klmp200:taiste
klmp200:dependabot/pip/taiste/django-phonenumber-field-7.2.0
klmp200:dependabot/pip/pillow-10.0.1
klmp200:dependabot/pip/taiste/coverage-7.3.2
klmp200:dependabot/pip/taiste/ipython-8.12.3
klmp200:dependabot/pip/reportlab-3.6.13
klmp200:fix/license
klmp200:dependabot/pip/certifi-2023.7.22
klmp200:dependabot/pip/pygments-2.15.0
klmp200:dependabot/pip/requests-2.31.0
klmp200:feature/improved-header-buttons
klmp200:dependabot/pip/taiste/django-4.2.1
klmp200:feature/accounts-dump
klmp200:feature/account-dumping
klmp200:feature/easy_switch_weekmail_banner

No commits in common. "6a586020f1d5f6f6492a92b6423c5ac44d9f35bd" and "2480644f1cde156390554f0e3f2ae2e77f4a4ba5" have entirely different histories.
6a586020f1 ... 2480644f1c

5 changed files with 145 additions and 179 deletions
Show Stats Expand all files Collapse all files

1
core/templates/core/user_tools.jinja
View File

@ -13,7 +13,6 @@
{% if user.is_root %} {% if user.is_root %}
<li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li> <li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li>
<li><a href="{{ url('rootplace:merge') }}">{% trans %}Merge users{% endtrans %}</a></li> <li><a href="{{ url('rootplace:merge') }}">{% trans %}Merge users{% endtrans %}</a></li>
<li><a href="{{ url('rootplace:delete_forum_messages') }}">{% trans %}Delete user's forum messages{% endtrans %}</a></li>
{% endif %} {% endif %}
{% if user.can_create_subscription or user.is_root %} {% if user.can_create_subscription or user.is_root %}
<li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li> <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>

262
locale/fr/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-03-17 17:55+0100\n" "POT-Creation-Date: 2018-12-19 14:00+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"
@ -18,10 +18,11 @@ msgstr ""
#: accounting/models.py:61 accounting/models.py:110 accounting/models.py:138 #: accounting/models.py:61 accounting/models.py:110 accounting/models.py:138
#: accounting/models.py:203 club/models.py:48 com/models.py:231 #: accounting/models.py:203 club/models.py:48 com/models.py:231
#: com/models.py:248 counter/models.py:119 counter/models.py:147 #: com/models.py:248 core/templates/core/base.jinja:333 counter/models.py:119
#: counter/models.py:209 forum/models.py:58 launderette/models.py:38 #: counter/models.py:147 counter/models.py:209 forum/models.py:58
#: launderette/models.py:90 launderette/models.py:125 stock/models.py:40 #: launderette/models.py:38 launderette/models.py:90 launderette/models.py:125
#: stock/models.py:60 stock/models.py:100 stock/models.py:127 #: stock/models.py:40 stock/models.py:60 stock/models.py:100
#: stock/models.py:127
msgid "name" msgid "name"
msgstr "nom" msgstr "nom"
@ -316,7 +317,7 @@ msgstr "Liste des types comptable"
#: accounting/templates/accounting/label_list.jinja:10 #: accounting/templates/accounting/label_list.jinja:10
#: accounting/templates/accounting/operation_edit.jinja:10 #: accounting/templates/accounting/operation_edit.jinja:10
#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja:10 #: accounting/templates/accounting/simplifiedaccountingtype_list.jinja:10
#: core/templates/core/user_tools.jinja:57 #: core/templates/core/user_tools.jinja:56
msgid "Accounting" msgid "Accounting"
msgstr "Comptabilité" msgstr "Comptabilité"
@ -335,7 +336,7 @@ msgstr "Il n'y a pas de types comptable dans ce site web."
#: accounting/templates/accounting/bank_account_details.jinja:4 #: accounting/templates/accounting/bank_account_details.jinja:4
#: accounting/templates/accounting/bank_account_details.jinja:14 #: accounting/templates/accounting/bank_account_details.jinja:14
#: core/templates/core/user_tools.jinja:66 #: core/templates/core/user_tools.jinja:65
msgid "Bank account: " msgid "Bank account: "
msgstr "Compte en banque : " msgstr "Compte en banque : "
@ -418,7 +419,7 @@ msgstr "Nouveau compte club"
#: com/templates/com/screen_list.jinja:26 com/templates/com/weekmail.jinja:32 #: com/templates/com/screen_list.jinja:26 com/templates/com/weekmail.jinja:32
#: com/templates/com/weekmail.jinja:61 core/templates/core/file.jinja:38 #: com/templates/com/weekmail.jinja:61 core/templates/core/file.jinja:38
#: core/templates/core/page.jinja:35 core/templates/core/poster_list.jinja:40 #: core/templates/core/page.jinja:35 core/templates/core/poster_list.jinja:40
#: core/templates/core/user_tools.jinja:42 core/views/user.py:237 #: core/templates/core/user_tools.jinja:41 core/views/user.py:237
#: counter/templates/counter/cash_summary_list.jinja:53 #: 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:33 #: counter/templates/counter/counter_list.jinja:33
@ -564,7 +565,7 @@ msgstr "Voir"
#: accounting/templates/accounting/co_list.jinja:4 #: accounting/templates/accounting/co_list.jinja:4
#: accounting/templates/accounting/journal_details.jinja:19 #: accounting/templates/accounting/journal_details.jinja:19
#: core/templates/core/user_tools.jinja:62 #: core/templates/core/user_tools.jinja:61
msgid "Company list" msgid "Company list"
msgstr "Liste des entreprises" msgstr "Liste des entreprises"
@ -770,13 +771,13 @@ msgstr "Opération liée : "
#: core/templates/core/create.jinja:12 core/templates/core/edit.jinja:7 #: core/templates/core/create.jinja:12 core/templates/core/edit.jinja:7
#: core/templates/core/edit.jinja:15 core/templates/core/edit.jinja:20 #: core/templates/core/edit.jinja:15 core/templates/core/edit.jinja:20
#: core/templates/core/file_edit.jinja:8 #: core/templates/core/file_edit.jinja:8
#: core/templates/core/macros_pages.jinja:25 #: core/templates/core/macros_pages.jinja:26
#: core/templates/core/page_prop.jinja:11 #: core/templates/core/page_prop.jinja:11
#: core/templates/core/user_godfathers.jinja:41 #: core/templates/core/user_godfathers.jinja:41
#: core/templates/core/user_preferences.jinja:12 #: core/templates/core/user_preferences.jinja:12
#: core/templates/core/user_preferences.jinja:19 #: core/templates/core/user_preferences.jinja:19
#: counter/templates/counter/cash_register_summary.jinja:22 #: counter/templates/counter/cash_register_summary.jinja:22
#: forum/templates/forum/reply.jinja:33 #: forum/templates/forum/reply.jinja:34
#: subscription/templates/subscription/subscription.jinja:25 #: subscription/templates/subscription/subscription.jinja:25
#: trombi/templates/trombi/comment.jinja:26 #: trombi/templates/trombi/comment.jinja:26
#: trombi/templates/trombi/edit_profile.jinja:13 #: trombi/templates/trombi/edit_profile.jinja:13
@ -1007,7 +1008,7 @@ msgid "inactive"
msgstr "inactif" msgstr "inactif"
#: club/templates/club/club_list.jinja:34 #: club/templates/club/club_list.jinja:34
#: core/templates/core/user_tools.jinja:23 #: core/templates/core/user_tools.jinja:22
msgid "New club" msgid "New club"
msgstr "Nouveau club" msgstr "Nouveau club"
@ -1146,7 +1147,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:101 #: core/templates/core/user_tools.jinja:100
msgid "Club tools" msgid "Club tools"
msgstr "Outils club" msgstr "Outils club"
@ -1173,7 +1174,7 @@ msgstr "Nouveau Trombi"
#: club/templates/club/club_tools.jinja:14 #: club/templates/club/club_tools.jinja:14
#: com/templates/com/poster_list.jinja:17 #: com/templates/com/poster_list.jinja:17
#: core/templates/core/poster_list.jinja:17 #: core/templates/core/poster_list.jinja:17
#: core/templates/core/user_tools.jinja:91 #: core/templates/core/user_tools.jinja:90
msgid "Posters" msgid "Posters"
msgstr "Affiches" msgstr "Affiches"
@ -1255,7 +1256,7 @@ msgstr "Anciens membres"
msgid "History" msgid "History"
msgstr "Historique" msgstr "Historique"
#: club/views.py:165 core/templates/core/base.jinja:121 core/views/user.py:228 #: club/views.py:165 core/templates/core/base.jinja:116 core/views/user.py:228
#: sas/templates/sas/picture.jinja:95 trombi/views.py:60 #: sas/templates/sas/picture.jinja:95 trombi/views.py:60
msgid "Tools" msgid "Tools"
msgstr "Outils" msgstr "Outils"
@ -1291,7 +1292,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:412 com/views.py:85 com/views.py:221 counter/views.py:1487 #: club/views.py:412 com/views.py:85 com/views.py:210 counter/views.py:1487
#: election/views.py:190 subscription/views.py:52 #: election/views.py:190 subscription/views.py:52
msgid "End date" msgid "End date"
msgstr "Date de fin" msgstr "Date de fin"
@ -1410,7 +1411,7 @@ msgid "Begin date should be before end date"
msgstr "La date de début doit être avant celle de fin" msgstr "La date de début doit être avant celle de fin"
#: com/templates/com/mailing_admin.jinja:4 com/views.py:134 #: com/templates/com/mailing_admin.jinja:4 com/views.py:134
#: core/templates/core/user_tools.jinja:90 #: core/templates/core/user_tools.jinja:89
msgid "Mailing lists administration" msgid "Mailing lists administration"
msgstr "Administration des mailing listes" msgstr "Administration des mailing listes"
@ -1458,7 +1459,7 @@ msgstr "Nouvelles"
#: com/templates/com/news_admin_list.jinja:11 #: com/templates/com/news_admin_list.jinja:11
#: com/templates/com/news_edit.jinja:8 com/templates/com/news_edit.jinja:31 #: com/templates/com/news_edit.jinja:8 com/templates/com/news_edit.jinja:31
#: core/templates/core/user_tools.jinja:84 #: core/templates/core/user_tools.jinja:83
msgid "Create news" msgid "Create news"
msgstr "Créer nouvelle" msgstr "Créer nouvelle"
@ -1492,8 +1493,9 @@ msgstr "Type"
#: com/templates/com/news_admin_list.jinja:249 #: com/templates/com/news_admin_list.jinja:249
#: com/templates/com/news_admin_list.jinja:286 #: com/templates/com/news_admin_list.jinja:286
#: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48
#: forum/templates/forum/forum.jinja:24 forum/templates/forum/forum.jinja:43 #: core/templates/core/base.jinja:343 forum/templates/forum/forum.jinja:24
#: forum/templates/forum/main.jinja:27 forum/views.py:240 #: forum/templates/forum/forum.jinja:43 forum/templates/forum/main.jinja:27
#: forum/views.py:240
msgid "Title" msgid "Title"
msgstr "Titre" msgstr "Titre"
@ -1570,7 +1572,7 @@ msgid "Calls to moderate"
msgstr "Appels à modérer" msgstr "Appels à modérer"
#: com/templates/com/news_admin_list.jinja:242 #: com/templates/com/news_admin_list.jinja:242
#: core/templates/core/base.jinja:171 #: core/templates/core/base.jinja:166
msgid "Events" msgid "Events"
msgstr "Événements" msgstr "Événements"
@ -1626,6 +1628,8 @@ msgstr ""
"concours, ...)" "concours, ...)"
#: com/templates/com/news_edit.jinja:56 com/templates/com/weekmail.jinja:10 #: com/templates/com/news_edit.jinja:56 com/templates/com/weekmail.jinja:10
#: core/templates/core/macros_pages.jinja:49
#: forum/templates/forum/reply.jinja:33
msgid "Preview" msgid "Preview"
msgstr "Prévisualiser" msgstr "Prévisualiser"
@ -1708,7 +1712,7 @@ msgid "Screen - edit"
msgstr "Écran - modifier" msgstr "Écran - modifier"
#: com/templates/com/screen_list.jinja:4 com/templates/com/screen_list.jinja:11 #: com/templates/com/screen_list.jinja:4 com/templates/com/screen_list.jinja:11
#: core/templates/core/user_tools.jinja:92 #: core/templates/core/user_tools.jinja:91
msgid "Screens" msgid "Screens"
msgstr "Écrans" msgstr "Écrans"
@ -1723,7 +1727,7 @@ msgid "Slideshow"
msgstr "Diaporama" msgstr "Diaporama"
#: com/templates/com/weekmail.jinja:5 com/templates/com/weekmail.jinja:9 #: com/templates/com/weekmail.jinja:5 com/templates/com/weekmail.jinja:9
#: com/views.py:108 core/templates/core/user_tools.jinja:82 #: com/views.py:108 core/templates/core/user_tools.jinja:81
msgid "Weekmail" msgid "Weekmail"
msgstr "Weekmail" msgstr "Weekmail"
@ -1810,7 +1814,7 @@ msgstr "Astuce"
msgid "Final word" msgid "Final word"
msgstr "Le mot de la fin" msgstr "Le mot de la fin"
#: com/views.py:78 com/views.py:215 election/views.py:185 #: com/views.py:78 com/views.py:204 election/views.py:185
#: subscription/views.py:46 #: subscription/views.py:46
msgid "Start date" msgid "Start date"
msgstr "Date de début" msgstr "Date de début"
@ -1819,7 +1823,7 @@ msgstr "Date de début"
msgid "Communication administration" msgid "Communication administration"
msgstr "Administration de la communication" msgstr "Administration de la communication"
#: com/views.py:114 core/templates/core/user_tools.jinja:83 #: com/views.py:114 core/templates/core/user_tools.jinja:82
msgid "Weekmail destinations" msgid "Weekmail destinations"
msgstr "Destinataires du Weekmail" msgstr "Destinataires du Weekmail"
@ -1839,31 +1843,31 @@ msgstr "Message d'alerte"
msgid "Screens list" msgid "Screens list"
msgstr "Liste d'écrans" msgstr "Liste d'écrans"
#: com/views.py:226 #: com/views.py:215
msgid "Until" msgid "Until"
msgstr "Jusqu'à" msgstr "Jusqu'à"
#: com/views.py:228 #: com/views.py:217
msgid "Automoderation" msgid "Automoderation"
msgstr "Automodération" msgstr "Automodération"
#: com/views.py:235 com/views.py:239 com/views.py:249 #: com/views.py:224 com/views.py:228 com/views.py:238
msgid "This field is required." msgid "This field is required."
msgstr "Ce champ est obligatoire." msgstr "Ce champ est obligatoire."
#: com/views.py:245 #: com/views.py:234
msgid "You crazy? You can not finish an event before starting it." msgid "You crazy? You can not finish an event before starting it."
msgstr "T'es fou? Un événement ne peut pas finir avant même de commencer." msgstr "T'es fou? Un événement ne peut pas finir avant même de commencer."
#: com/views.py:474 #: com/views.py:463
msgid "Delete and save to regenerate" msgid "Delete and save to regenerate"
msgstr "Supprimer et sauver pour regénérer" msgstr "Supprimer et sauver pour regénérer"
#: com/views.py:489 #: com/views.py:472
msgid "Weekmail of the " msgid "Weekmail of the "
msgstr "Weekmail du " msgstr "Weekmail du "
#: com/views.py:599 #: com/views.py:574
msgid "" msgid ""
"You must be a board member of the selected club to post in the Weekmail." "You must be a board member of the selected club to post in the Weekmail."
msgstr "" msgstr ""
@ -1997,7 +2001,7 @@ msgstr "-"
msgid "XS" msgid "XS"
msgstr "XS" msgstr "XS"
#: core/models.py:214 #: core/models.py:214 core/templates/core/base.jinja:356
msgid "S" msgid "S"
msgstr "S" msgstr "S"
@ -2110,7 +2114,8 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
#: core/templates/core/user_edit.jinja:17 #: core/templates/core/user_edit.jinja:17
#: election/templates/election/election_detail.jinja:340 #: election/templates/election/election_detail.jinja:340
#: forum/templates/forum/macros.jinja:104 #: forum/templates/forum/macros.jinja:104
#: forum/templates/forum/macros.jinja:106 #: forum/templates/forum/macros.jinja:106 forum/templates/forum/reply.jinja:39
#: forum/templates/forum/reply.jinja:41
#: trombi/templates/trombi/user_tools.jinja:41 #: trombi/templates/trombi/user_tools.jinja:41
msgid "Profile" msgid "Profile"
msgstr "Profil" msgstr "Profil"
@ -2289,24 +2294,24 @@ msgstr "500, Erreur Serveur"
msgid "Welcome!" msgid "Welcome!"
msgstr "Bienvenue!" msgstr "Bienvenue!"
#: core/templates/core/base.jinja:53 #: core/templates/core/base.jinja:48
msgid "Username" msgid "Username"
msgstr "Nom d'utilisateur" msgstr "Nom d'utilisateur"
#: core/templates/core/base.jinja:55 #: core/templates/core/base.jinja:50
msgid "Password" msgid "Password"
msgstr "Mot de passe" msgstr "Mot de passe"
#: core/templates/core/base.jinja:57 core/templates/core/login.jinja:4 #: core/templates/core/base.jinja:52 core/templates/core/login.jinja:4
#: core/templates/core/password_reset_complete.jinja:5 #: core/templates/core/password_reset_complete.jinja:5
msgid "Login" msgid "Login"
msgstr "Connexion" msgstr "Connexion"
#: core/templates/core/base.jinja:59 core/templates/core/register.jinja:18 #: core/templates/core/base.jinja:54 core/templates/core/register.jinja:18
msgid "Register" msgid "Register"
msgstr "S'enregister" msgstr "S'enregister"
#: core/templates/core/base.jinja:83 core/templates/core/base.jinja:84 #: core/templates/core/base.jinja:78 core/templates/core/base.jinja:79
#: forum/templates/forum/macros.jinja:171 #: forum/templates/forum/macros.jinja:171
#: forum/templates/forum/macros.jinja:175 #: forum/templates/forum/macros.jinja:175
#: matmat/templates/matmat/search_form.jinja:37 #: matmat/templates/matmat/search_form.jinja:37
@ -2315,56 +2320,56 @@ msgstr "S'enregister"
msgid "Search" msgid "Search"
msgstr "Recherche" msgstr "Recherche"
#: core/templates/core/base.jinja:110 #: core/templates/core/base.jinja:105
msgid "View more" msgid "View more"
msgstr "Voir plus" msgstr "Voir plus"
#: core/templates/core/base.jinja:114 #: core/templates/core/base.jinja:109
#: forum/templates/forum/last_unread.jinja:17 #: forum/templates/forum/last_unread.jinja:17
msgid "Mark all as read" msgid "Mark all as read"
msgstr "Marquer tout commme lu" msgstr "Marquer tout commme lu"
#: core/templates/core/base.jinja:124 #: core/templates/core/base.jinja:119
msgid "Logout" msgid "Logout"
msgstr "Déconnexion" msgstr "Déconnexion"
#: core/templates/core/base.jinja:157 #: core/templates/core/base.jinja:152
msgid "Main" msgid "Main"
msgstr "Accueil" msgstr "Accueil"
#: core/templates/core/base.jinja:159 #: core/templates/core/base.jinja:154
msgid "Associations & Clubs" msgid "Associations & Clubs"
msgstr "Associations & Clubs" msgstr "Associations & Clubs"
#: core/templates/core/base.jinja:163 #: core/templates/core/base.jinja:158
msgid "AE" msgid "AE"
msgstr "L'AE" msgstr "L'AE"
#: core/templates/core/base.jinja:164 #: core/templates/core/base.jinja:159
msgid "AE's clubs" msgid "AE's clubs"
msgstr "Les clubs de L'AE" msgstr "Les clubs de L'AE"
#: core/templates/core/base.jinja:165 #: core/templates/core/base.jinja:160
msgid "BdF" msgid "BdF"
msgstr "Le BdF" msgstr "Le BdF"
#: core/templates/core/base.jinja:166 #: core/templates/core/base.jinja:161
msgid "BDS" msgid "BDS"
msgstr "Le BDS" msgstr "Le BDS"
#: core/templates/core/base.jinja:167 #: core/templates/core/base.jinja:162
msgid "CETU" msgid "CETU"
msgstr "Le CETU" msgstr "Le CETU"
#: core/templates/core/base.jinja:175 #: core/templates/core/base.jinja:170
msgid "Calendar" msgid "Calendar"
msgstr "Calendrier" msgstr "Calendrier"
#: core/templates/core/base.jinja:176 #: core/templates/core/base.jinja:171
msgid "Big event" msgid "Big event"
msgstr "GA" msgstr "GA"
#: core/templates/core/base.jinja:179 #: core/templates/core/base.jinja:174
#: forum/templates/forum/favorite_topics.jinja:14 #: forum/templates/forum/favorite_topics.jinja:14
#: forum/templates/forum/last_unread.jinja:14 #: forum/templates/forum/last_unread.jinja:14
#: forum/templates/forum/macros.jinja:90 forum/templates/forum/main.jinja:6 #: forum/templates/forum/macros.jinja:90 forum/templates/forum/main.jinja:6
@ -2373,11 +2378,11 @@ msgstr "GA"
msgid "Forum" msgid "Forum"
msgstr "Forum" msgstr "Forum"
#: core/templates/core/base.jinja:180 #: core/templates/core/base.jinja:175
msgid "Gallery" msgid "Gallery"
msgstr "Photos" msgstr "Photos"
#: core/templates/core/base.jinja:181 counter/models.py:217 #: core/templates/core/base.jinja:176 counter/models.py:217
#: counter/templates/counter/counter_list.jinja:11 #: counter/templates/counter/counter_list.jinja:11
#: eboutic/templates/eboutic/eboutic_main.jinja:4 #: eboutic/templates/eboutic/eboutic_main.jinja:4
#: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_main.jinja:24
@ -2387,74 +2392,110 @@ msgstr "Photos"
msgid "Eboutic" msgid "Eboutic"
msgstr "Eboutic" msgstr "Eboutic"
#: core/templates/core/base.jinja:183 #: core/templates/core/base.jinja:178
msgid "Services" msgid "Services"
msgstr "Services" msgstr "Services"
#: core/templates/core/base.jinja:187 #: core/templates/core/base.jinja:182
msgid "Matmatronch" msgid "Matmatronch"
msgstr "Matmatronch" msgstr "Matmatronch"
#: core/templates/core/base.jinja:188 launderette/models.py:44 #: core/templates/core/base.jinja:183 launderette/models.py:44
#: launderette/templates/launderette/launderette_book.jinja:5 #: launderette/templates/launderette/launderette_book.jinja:5
#: launderette/templates/launderette/launderette_book_choose.jinja:4 #: launderette/templates/launderette/launderette_book_choose.jinja:4
#: launderette/templates/launderette/launderette_main.jinja:4 #: launderette/templates/launderette/launderette_main.jinja:4
msgid "Launderette" msgid "Launderette"
msgstr "Laverie" msgstr "Laverie"
#: core/templates/core/base.jinja:189 core/templates/core/file.jinja:20 #: core/templates/core/base.jinja:184 core/templates/core/file.jinja:20
#: core/views/files.py:86 #: core/views/files.py:86
msgid "Files" msgid "Files"
msgstr "Fichiers" msgstr "Fichiers"
#: core/templates/core/base.jinja:190 #: core/templates/core/base.jinja:185
msgid "Pedagogy" msgid "Pedagogy"
msgstr "Pédagogie" msgstr "Pédagogie"
#: core/templates/core/base.jinja:193 #: core/templates/core/base.jinja:188
msgid "Sponsors" msgid "Sponsors"
msgstr "Partenaires" msgstr "Partenaires"
#: core/templates/core/base.jinja:195 #: core/templates/core/base.jinja:190
msgid "Help" msgid "Help"
msgstr "Aide" msgstr "Aide"
#: core/templates/core/base.jinja:199 #: core/templates/core/base.jinja:194
msgid "FAQ" msgid "FAQ"
msgstr "FAQ" msgstr "FAQ"
#: core/templates/core/base.jinja:200 core/templates/core/base.jinja:242 #: core/templates/core/base.jinja:195 core/templates/core/base.jinja:237
msgid "Contacts" msgid "Contacts"
msgstr "Contacts" msgstr "Contacts"
#: core/templates/core/base.jinja:201 #: core/templates/core/base.jinja:196
msgid "Wiki" msgid "Wiki"
msgstr "Wiki" msgstr "Wiki"
#: core/templates/core/base.jinja:243 #: core/templates/core/base.jinja:238
msgid "Legal notices" msgid "Legal notices"
msgstr "Mentions légales" msgstr "Mentions légales"
#: core/templates/core/base.jinja:244 #: core/templates/core/base.jinja:239
msgid "Intellectual property" msgid "Intellectual property"
msgstr "Propriété intellectuelle" msgstr "Propriété intellectuelle"
#: core/templates/core/base.jinja:245 #: core/templates/core/base.jinja:240
msgid "Help & Documentation" msgid "Help & Documentation"
msgstr "Aide & Documentation" msgstr "Aide & Documentation"
#: core/templates/core/base.jinja:246 #: core/templates/core/base.jinja:241
msgid "R&D" msgid "R&D"
msgstr "R&D" msgstr "R&D"
#: core/templates/core/base.jinja:247 #: core/templates/core/base.jinja:242
msgid "Former website" msgid "Former website"
msgstr "Ancien site" msgstr "Ancien site"
#: core/templates/core/base.jinja:249 #: core/templates/core/base.jinja:244
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"
#: core/templates/core/base.jinja:340
msgid "https://path/to/image.gif"
msgstr "https://chemin/vers/image.gif"
#: core/templates/core/base.jinja:342
msgid "alternative text"
msgstr "texte alternatif"
#: core/templates/core/base.jinja:352
msgid "Image"
msgstr "Image"
#: core/templates/core/base.jinja:353
msgid "Link"
msgstr "Lien"
#: core/templates/core/base.jinja:354
msgid "sup"
msgstr "exp"
#: core/templates/core/base.jinja:355
msgid "sub"
msgstr "ind"
#: core/templates/core/base.jinja:357
msgid "U"
msgstr "S"
#: core/templates/core/base.jinja:358
msgid "I"
msgstr "I"
#: core/templates/core/base.jinja:359
msgid "B"
msgstr "G"
#: core/templates/core/create.jinja:4 core/templates/core/create.jinja:8 #: core/templates/core/create.jinja:4 core/templates/core/create.jinja:8
#, python-format #, python-format
msgid "Create %(name)s" msgid "Create %(name)s"
@ -2917,7 +2958,7 @@ msgid "Eboutic invoices"
msgstr "Facture eboutic" msgstr "Facture eboutic"
#: core/templates/core/user_account.jinja:57 #: core/templates/core/user_account.jinja:57
#: core/templates/core/user_tools.jinja:36 counter/views.py:745 #: core/templates/core/user_tools.jinja:35 counter/views.py:745
msgid "Etickets" msgid "Etickets"
msgstr "Etickets" msgstr "Etickets"
@ -3216,135 +3257,130 @@ msgstr "Groupes"
msgid "Merge users" msgid "Merge users"
msgstr "Fusionner deux utilisateurs" msgstr "Fusionner deux utilisateurs"
#: core/templates/core/user_tools.jinja:16 #: core/templates/core/user_tools.jinja:18
#: rootplace/templates/rootplace/delete_user_messages.jinja:4
msgid "Delete user's forum messages"
msgstr "Supprimer les messages forum d'un utilisateur"
#: core/templates/core/user_tools.jinja:19
msgid "Subscriptions" msgid "Subscriptions"
msgstr "Cotisations" msgstr "Cotisations"
#: core/templates/core/user_tools.jinja:22 #: core/templates/core/user_tools.jinja:21
#: subscription/templates/subscription/stats.jinja:4 #: subscription/templates/subscription/stats.jinja:4
msgid "Subscription stats" msgid "Subscription stats"
msgstr "Statistiques de cotisation" msgstr "Statistiques de cotisation"
#: core/templates/core/user_tools.jinja:28 counter/views.py:715 #: core/templates/core/user_tools.jinja:27 counter/views.py:715
#: counter/views.py:923 #: counter/views.py:923
msgid "Counters" msgid "Counters"
msgstr "Comptoirs" msgstr "Comptoirs"
#: core/templates/core/user_tools.jinja:31 #: core/templates/core/user_tools.jinja:30
msgid "General counters management" msgid "General counters management"
msgstr "Gestion générale des comptoirs" msgstr "Gestion générale des comptoirs"
#: core/templates/core/user_tools.jinja:32 #: core/templates/core/user_tools.jinja:31
msgid "Products management" msgid "Products management"
msgstr "Gestion des produits" msgstr "Gestion des produits"
#: core/templates/core/user_tools.jinja:33 #: core/templates/core/user_tools.jinja:32
msgid "Product types management" msgid "Product types management"
msgstr "Gestion des types de produit" msgstr "Gestion des types de produit"
#: core/templates/core/user_tools.jinja:34 #: core/templates/core/user_tools.jinja:33
#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:735 #: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:735
msgid "Cash register summaries" msgid "Cash register summaries"
msgstr "Relevés de caisse" msgstr "Relevés de caisse"
#: core/templates/core/user_tools.jinja:35 #: core/templates/core/user_tools.jinja:34
#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:740 #: counter/templates/counter/invoices_call.jinja:4 counter/views.py:740
msgid "Invoices call" msgid "Invoices call"
msgstr "Appels à facture" msgstr "Appels à facture"
#: core/templates/core/user_tools.jinja:43 core/views/user.py:286 #: core/templates/core/user_tools.jinja:42 core/views/user.py:286
#: counter/templates/counter/counter_list.jinja:18 #: counter/templates/counter/counter_list.jinja:18
#: counter/templates/counter/counter_list.jinja:34 #: counter/templates/counter/counter_list.jinja:34
#: counter/templates/counter/counter_list.jinja:56 #: counter/templates/counter/counter_list.jinja:56
msgid "Stats" msgid "Stats"
msgstr "Stats" msgstr "Stats"
#: core/templates/core/user_tools.jinja:47 #: core/templates/core/user_tools.jinja:46
#: counter/templates/counter/counter_list.jinja:38 #: counter/templates/counter/counter_list.jinja:38
#: stock/templates/stock/stock_item_list.jinja:11 #: stock/templates/stock/stock_item_list.jinja:11
#: stock/templates/stock/stock_list.jinja:16 #: stock/templates/stock/stock_list.jinja:16
msgid "Shopping lists" msgid "Shopping lists"
msgstr "Liste de courses" msgstr "Liste de courses"
#: core/templates/core/user_tools.jinja:49 #: core/templates/core/user_tools.jinja:48
#: counter/templates/counter/counter_list.jinja:40 #: counter/templates/counter/counter_list.jinja:40
msgid "Create new stock" msgid "Create new stock"
msgstr "Créer nouveau stock" msgstr "Créer nouveau stock"
#: core/templates/core/user_tools.jinja:60 #: core/templates/core/user_tools.jinja:59
msgid "Refound Account" msgid "Refound Account"
msgstr "Rembourser un compte" msgstr "Rembourser un compte"
#: core/templates/core/user_tools.jinja:61 #: core/templates/core/user_tools.jinja:60
msgid "General accounting" msgid "General accounting"
msgstr "Comptabilité générale" msgstr "Comptabilité générale"
#: core/templates/core/user_tools.jinja:71 #: core/templates/core/user_tools.jinja:70
msgid "Club account: " msgid "Club account: "
msgstr "Compte club : " msgstr "Compte club : "
#: core/templates/core/user_tools.jinja:78 #: core/templates/core/user_tools.jinja:77
msgid "Communication" msgid "Communication"
msgstr "Communication" msgstr "Communication"
#: core/templates/core/user_tools.jinja:81 #: core/templates/core/user_tools.jinja:80
msgid "Create weekmail article" msgid "Create weekmail article"
msgstr "Rédiger un nouvel article dans le Weekmail" msgstr "Rédiger un nouvel article dans le Weekmail"
#: core/templates/core/user_tools.jinja:85 #: core/templates/core/user_tools.jinja:84
msgid "Moderate news" msgid "Moderate news"
msgstr "Modérer les nouvelles" msgstr "Modérer les nouvelles"
#: core/templates/core/user_tools.jinja:86 #: core/templates/core/user_tools.jinja:85
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:87 #: core/templates/core/user_tools.jinja:86
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:88 #: core/templates/core/user_tools.jinja:87
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:89 #: core/templates/core/user_tools.jinja:88
msgid "Moderate files" msgid "Moderate files"
msgstr "Modérer les fichiers" msgstr "Modérer les fichiers"
#: core/templates/core/user_tools.jinja:95 #: core/templates/core/user_tools.jinja:94
msgid "Moderate pictures" msgid "Moderate pictures"
msgstr "Modérer les photos" msgstr "Modérer les photos"
#: core/templates/core/user_tools.jinja:108 #: core/templates/core/user_tools.jinja:107
msgid "Elections" msgid "Elections"
msgstr "Élections" msgstr "Élections"
#: core/templates/core/user_tools.jinja:110 #: core/templates/core/user_tools.jinja:109
msgid "See available elections" msgid "See available elections"
msgstr "Voir les élections disponibles" msgstr "Voir les élections disponibles"
#: core/templates/core/user_tools.jinja:111 #: core/templates/core/user_tools.jinja:110
msgid "See archived elections" msgid "See archived elections"
msgstr "Voir les élections archivées" msgstr "Voir les élections archivées"
#: core/templates/core/user_tools.jinja:113 #: core/templates/core/user_tools.jinja:112
msgid "Create a new election" msgid "Create a new election"
msgstr "Créer une nouvelle élection" msgstr "Créer une nouvelle élection"
#: core/templates/core/user_tools.jinja:116 #: core/templates/core/user_tools.jinja:115
msgid "Other tools" msgid "Other tools"
msgstr "Autres outils" msgstr "Autres outils"
#: core/templates/core/user_tools.jinja:118 #: core/templates/core/user_tools.jinja:117
msgid "Convert dokuwiki/BBcode syntax to Markdown" msgid "Convert dokuwiki/BBcode syntax to Markdown"
msgstr "Convertir de la syntaxe dokuwiki/BBcode vers Markdown" msgstr "Convertir de la syntaxe dokuwiki/BBcode vers Markdown"
#: core/templates/core/user_tools.jinja:119 #: core/templates/core/user_tools.jinja:118
msgid "Trombi tools" msgid "Trombi tools"
msgstr "Outils Trombi" msgstr "Outils Trombi"
@ -4607,14 +4643,6 @@ msgstr "Sexe"
msgid "Last/First name or nickname" msgid "Last/First name or nickname"
msgstr "Nom de famille, prénom ou surnom" msgstr "Nom de famille, prénom ou surnom"
#: rootplace/templates/rootplace/delete_user_messages.jinja:8
msgid "Delete all forum messages from an user"
msgstr "Supprimer tous les messages forum d'un utilisateur"
#: rootplace/templates/rootplace/delete_user_messages.jinja:12
msgid "Delete messages"
msgstr "Supprimer les messages"
#: rootplace/templates/rootplace/merge.jinja:8 #: rootplace/templates/rootplace/merge.jinja:8
msgid "Merge two users" msgid "Merge two users"
msgstr "Fusionner deux utilisateurs" msgstr "Fusionner deux utilisateurs"
@ -4623,18 +4651,14 @@ msgstr "Fusionner deux utilisateurs"
msgid "Merge" msgid "Merge"
msgstr "Fusion" msgstr "Fusion"
#: rootplace/views.py:93 #: rootplace/views.py:92
msgid "User that will be kept" msgid "User that will be kept"
msgstr "Utilisateur qui sera conservé" msgstr "Utilisateur qui sera conservé"
#: rootplace/views.py:96 #: rootplace/views.py:95
msgid "User that will be deleted" msgid "User that will be deleted"
msgstr "Utilisateur qui sera supprimé" msgstr "Utilisateur qui sera supprimé"
#: rootplace/views.py:102
msgid "User to be selected"
msgstr "Utilisateur à sélectionner"
#: sas/models.py:243 #: sas/models.py:243
msgid "picture" msgid "picture"
msgstr "photo" msgstr "photo"

14
rootplace/templates/rootplace/delete_user_messages.jinja
View File

@ -1,14 +0,0 @@
{% extends "core/base.jinja" %}
{% block title %}
{% trans %}Delete user's forum messages{% endtrans %}
{% endblock %}
{% block content %}
<h3>{% trans %}Delete all forum messages from an user{% endtrans %}</h3>
<form action="" method="post">
{% csrf_token %}
{{ form.as_p() }}
<p><input type="submit" value="{% trans %}Delete messages{% endtrans %}" /></p>
</form>
{% endblock %}

9
rootplace/urls.py
View File

@ -26,11 +26,4 @@ from django.conf.urls import url
from rootplace.views import * from rootplace.views import *
urlpatterns = [ urlpatterns = [url(r"^merge$", MergeUsersView.as_view(), name="merge")]
url(r"^merge$", MergeUsersView.as_view(), name="merge"),
url(
r"^forum/messages/delete$",
DeleteAllForumUserMessagesView.as_view(),
name="delete_forum_messages",
),
]

38
rootplace/views.py
View File

@ -25,7 +25,7 @@
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.views.generic.edit import FormView from django.views.generic.edit import FormView
from django.core.urlresolvers import reverse, reverse_lazy from django.core.urlresolvers import reverse
from django import forms from django import forms
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
@ -33,7 +33,6 @@ from ajax_select.fields import AutoCompleteSelectField
from core.models import User from core.models import User
from counter.models import Customer from counter.models import Customer
from forum.models import ForumMessageMeta
def merge_users(u1, u2): def merge_users(u1, u2):
@ -97,12 +96,6 @@ class MergeForm(forms.Form):
) )
class SelectUserForm(forms.Form):
user = AutoCompleteSelectField(
"users", label=_("User to be selected"), help_text=None, required=True
)
class MergeUsersView(FormView): class MergeUsersView(FormView):
template_name = "rootplace/merge.jinja" template_name = "rootplace/merge.jinja"
form_class = MergeForm form_class = MergeForm
@ -121,32 +114,3 @@ class MergeUsersView(FormView):
def get_success_url(self): def get_success_url(self):
return reverse("core:user_profile", kwargs={"user_id": self.final_user.id}) return reverse("core:user_profile", kwargs={"user_id": self.final_user.id})
class DeleteAllForumUserMessagesView(FormView):
"""
Delete all forum messages from an user
Messages are soft deleted and are still visible from admins
"""
template_name = "rootplace/delete_user_messages.jinja"
form_class = SelectUserForm
def dispatch(self, request, *args, **kwargs):
res = super(DeleteAllForumUserMessagesView, self).dispatch(
request, *args, **kwargs
)
if request.user.is_root:
return res
raise PermissionDenied
def form_valid(self, form):
self.user = form.cleaned_data["user"]
for message in self.user.forum_messages.all():
ForumMessageMeta(
message=message, user=self.request.user, action="DELETE"
).save()
return super(DeleteAllForumUserMessagesView, self).form_valid(form)
def get_success_url(self):
return reverse("core:user_profile", kwargs={"user_id": self.user.id})