From f15971cecffda3c2f723c62e4d7f4151f61203b3 Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Mon, 8 Jul 2019 17:34:23 +0200 Subject: [PATCH] pedagogy: simplify moderation form for user --- locale/fr/LC_MESSAGES/django.po | 278 ++++++++++--------- pedagogy/templates/pedagogy/moderation.jinja | 74 ++--- 2 files changed, 165 insertions(+), 187 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index ba805fb4..f3198f85 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: 2019-07-07 23:59+0200\n" +"POT-Creation-Date: 2019-07-08 17:32+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -136,7 +136,7 @@ msgid "date" msgstr "date" #: accounting/models.py:270 counter/models.py:123 counter/models.py:616 -#: pedagogy/models.py:227 stock/models.py:102 +#: pedagogy/models.py:220 stock/models.py:102 msgid "comment" msgstr "commentaire" @@ -265,7 +265,7 @@ msgstr "" "Vous devez fournir soit un type comptable simplifié ou un type comptable " "standard" -#: accounting/models.py:442 counter/models.py:159 pedagogy/models.py:98 +#: accounting/models.py:442 counter/models.py:159 pedagogy/models.py:91 msgid "code" msgstr "code" @@ -377,12 +377,10 @@ msgstr "Compte en banque : " #: election/templates/election/election_detail.jinja:401 #: forum/templates/forum/macros.jinja:21 forum/templates/forum/macros.jinja:134 #: launderette/templates/launderette/launderette_admin.jinja:16 -#: launderette/views.py:226 pedagogy/templates/pedagogy/guide.jinja:56 -#: pedagogy/templates/pedagogy/guide.jinja:79 -#: pedagogy/templates/pedagogy/guide.jinja:115 -#: pedagogy/templates/pedagogy/moderation.jinja:18 -#: pedagogy/templates/pedagogy/moderation.jinja:45 -#: pedagogy/templates/pedagogy/uv_detail.jinja:172 +#: launderette/views.py:226 pedagogy/templates/pedagogy/guide.jinja:51 +#: pedagogy/templates/pedagogy/guide.jinja:74 +#: pedagogy/templates/pedagogy/guide.jinja:110 +#: pedagogy/templates/pedagogy/uv_detail.jinja:178 #: sas/templates/sas/album.jinja:26 sas/templates/sas/moderation.jinja:18 #: sas/templates/sas/picture.jinja:74 sas/templates/sas/picture.jinja:124 #: stock/templates/stock/stock_shopping_list.jinja:43 @@ -438,10 +436,10 @@ msgstr "Nouveau compte club" #: forum/templates/forum/macros.jinja:20 forum/templates/forum/macros.jinja:62 #: forum/templates/forum/macros.jinja:128 #: launderette/templates/launderette/launderette_list.jinja:16 -#: pedagogy/templates/pedagogy/guide.jinja:55 -#: pedagogy/templates/pedagogy/guide.jinja:78 -#: pedagogy/templates/pedagogy/guide.jinja:114 -#: pedagogy/templates/pedagogy/uv_detail.jinja:171 +#: pedagogy/templates/pedagogy/guide.jinja:50 +#: pedagogy/templates/pedagogy/guide.jinja:73 +#: pedagogy/templates/pedagogy/guide.jinja:109 +#: pedagogy/templates/pedagogy/uv_detail.jinja:177 #: sas/templates/sas/album.jinja:18 sas/templates/sas/picture.jinja:100 #: trombi/templates/trombi/detail.jinja:9 #: trombi/templates/trombi/edit_profile.jinja:34 @@ -671,9 +669,8 @@ msgstr "Effectuées" #: accounting/templates/accounting/journal_details.jinja:41 #: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1162 -#: pedagogy/templates/pedagogy/moderation.jinja:16 -#: pedagogy/templates/pedagogy/moderation.jinja:43 -#: pedagogy/templates/pedagogy/uv_detail.jinja:132 +#: pedagogy/templates/pedagogy/moderation.jinja:13 +#: pedagogy/templates/pedagogy/uv_detail.jinja:133 #: trombi/templates/trombi/comment.jinja:4 #: trombi/templates/trombi/comment.jinja:8 #: trombi/templates/trombi/user_tools.jinja:50 @@ -937,6 +934,7 @@ msgid "Remove" msgstr "Retirer" #: club/forms.py:75 launderette/views.py:228 +#: pedagogy/templates/pedagogy/moderation.jinja:15 msgid "Action" msgstr "Action" @@ -1427,7 +1425,7 @@ msgstr "Appel" #: com/models.py:69 com/models.py:155 com/models.py:213 election/models.py:14 #: election/models.py:116 election/models.py:156 forum/models.py:242 -#: forum/models.py:296 pedagogy/models.py:152 +#: forum/models.py:296 pedagogy/models.py:145 msgid "title" msgstr "titre" @@ -1445,8 +1443,8 @@ msgstr "contenu" msgid "type" msgstr "type" -#: com/models.py:77 com/models.py:216 pedagogy/models.py:113 -#: pedagogy/models.py:222 trombi/models.py:183 +#: com/models.py:77 com/models.py:216 pedagogy/models.py:106 +#: pedagogy/models.py:215 trombi/models.py:183 msgid "author" msgstr "auteur" @@ -1587,7 +1585,7 @@ msgstr "Type" #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: forum/templates/forum/forum.jinja:24 forum/templates/forum/forum.jinja:43 #: forum/templates/forum/main.jinja:27 forum/views.py:243 -#: pedagogy/templates/pedagogy/guide.jinja:49 +#: pedagogy/templates/pedagogy/guide.jinja:44 msgid "Title" msgstr "Titre" @@ -1854,8 +1852,8 @@ msgstr "Supprimer du Weekmail" #: 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:226 -#: pedagogy/templates/pedagogy/uv_detail.jinja:11 -#: pedagogy/templates/pedagogy/uv_detail.jinja:20 +#: pedagogy/templates/pedagogy/uv_detail.jinja:12 +#: pedagogy/templates/pedagogy/uv_detail.jinja:21 #: stock/templates/stock/shopping_list_items.jinja:9 #: trombi/templates/trombi/comment_moderation.jinja:10 #: trombi/templates/trombi/export.jinja:9 @@ -2146,7 +2144,7 @@ msgstr "département" msgid "dpt option" msgstr "Filière" -#: core/models.py:248 pedagogy/models.py:125 pedagogy/models.py:291 +#: core/models.py:248 pedagogy/models.py:118 pedagogy/models.py:284 msgid "semester" msgstr "semestre" @@ -2401,7 +2399,7 @@ msgstr "S'enregister" #: matmat/templates/matmat/search_form.jinja:37 #: matmat/templates/matmat/search_form.jinja:47 #: matmat/templates/matmat/search_form.jinja:58 -#: pedagogy/templates/pedagogy/guide.jinja:20 +#: pedagogy/templates/pedagogy/guide.jinja:21 msgid "Search" msgstr "Recherche" @@ -3467,12 +3465,12 @@ msgid "Moderate pictures" msgstr "Modérer les photos" #: core/templates/core/user_tools.jinja:112 -#: pedagogy/templates/pedagogy/guide.jinja:12 +#: pedagogy/templates/pedagogy/guide.jinja:13 msgid "Create UV" msgstr "Créer UV" #: core/templates/core/user_tools.jinja:113 -#: pedagogy/templates/pedagogy/guide.jinja:15 +#: pedagogy/templates/pedagogy/guide.jinja:16 #: trombi/templates/trombi/detail.jinja:10 msgid "Moderate comments" msgstr "Modérer les commentaires" @@ -4813,7 +4811,7 @@ msgstr "Signalements acceptés" msgid "Denied reports" msgstr "Signalements refusés" -#: pedagogy/models.py:105 +#: pedagogy/models.py:98 msgid "" "The code of an UV must only contains uppercase characters without accent and " "numbers" @@ -4821,104 +4819,104 @@ msgstr "" "Le code d'une UV doit seulement contenire des caractères majuscule sans " "accents et nombres" -#: pedagogy/models.py:118 +#: pedagogy/models.py:111 msgid "credit type" msgstr "type de crédit" -#: pedagogy/models.py:123 pedagogy/models.py:153 +#: pedagogy/models.py:116 pedagogy/models.py:146 msgid "uv manager" msgstr "gestionnaire d'uv" -#: pedagogy/models.py:131 +#: pedagogy/models.py:124 msgid "language" msgstr "langue" -#: pedagogy/models.py:137 +#: pedagogy/models.py:130 msgid "credits" msgstr "crédits" -#: pedagogy/models.py:145 +#: pedagogy/models.py:138 msgid "departmenmt" msgstr "département" -#: pedagogy/models.py:154 +#: pedagogy/models.py:147 msgid "objectives" msgstr "objecifs" -#: pedagogy/models.py:155 +#: pedagogy/models.py:148 msgid "program" msgstr "programme" -#: pedagogy/models.py:156 +#: pedagogy/models.py:149 msgid "skills" msgstr "compétences" -#: pedagogy/models.py:157 +#: pedagogy/models.py:150 msgid "key concepts" msgstr "concepts clefs" -#: pedagogy/models.py:162 +#: pedagogy/models.py:155 msgid "hours CM" msgstr "heures CM" -#: pedagogy/models.py:169 +#: pedagogy/models.py:162 msgid "hours TD" msgstr "heures TD" -#: pedagogy/models.py:176 +#: pedagogy/models.py:169 msgid "hours TP" msgstr "heures TP" -#: pedagogy/models.py:183 +#: pedagogy/models.py:176 msgid "hours THE" msgstr "heures THE" -#: pedagogy/models.py:190 +#: pedagogy/models.py:183 msgid "hours TE" msgstr "heures TE" -#: pedagogy/models.py:226 pedagogy/models.py:282 +#: pedagogy/models.py:219 pedagogy/models.py:275 msgid "uv" msgstr "uv" -#: pedagogy/models.py:229 pedagogy/templates/pedagogy/uv_detail.jinja:56 -#: pedagogy/templates/pedagogy/uv_detail.jinja:144 +#: pedagogy/models.py:222 pedagogy/templates/pedagogy/uv_detail.jinja:57 +#: pedagogy/templates/pedagogy/uv_detail.jinja:146 msgid "global grade" msgstr "note globale" -#: pedagogy/models.py:236 +#: pedagogy/models.py:229 msgid "utility grade" msgstr "note d'utilité" -#: pedagogy/models.py:243 +#: pedagogy/models.py:236 msgid "interest grade" msgstr "note d'intérêt" -#: pedagogy/models.py:250 +#: pedagogy/models.py:243 msgid "teaching grade" msgstr "note d'enseignement" -#: pedagogy/models.py:257 +#: pedagogy/models.py:250 msgid "work load grade" msgstr "note de charge de travail" -#: pedagogy/models.py:263 +#: pedagogy/models.py:256 msgid "publish date" msgstr "date de publication" -#: pedagogy/models.py:285 +#: pedagogy/models.py:278 msgid "grade" msgstr "note" -#: pedagogy/models.py:311 +#: pedagogy/models.py:304 msgid "report" msgstr "signaler" -#: pedagogy/models.py:315 +#: pedagogy/models.py:308 msgid "reporter" msgstr "signalant" -#: pedagogy/models.py:317 +#: pedagogy/models.py:310 msgid "reason" msgstr "raison" @@ -4926,90 +4924,52 @@ msgstr "raison" msgid "UV Guide" msgstr "Guide des UVs" -#: pedagogy/templates/pedagogy/guide.jinja:23 sith/settings.py:360 -msgid "EDIM" -msgstr "EDIM" +#: pedagogy/templates/pedagogy/guide.jinja:25 +#, fuzzy, python-format +#| msgid "display time" +msgid "%(display_name)s" +msgstr "temps d'affichage" -#: pedagogy/templates/pedagogy/guide.jinja:24 -msgid "ENERGIE" -msgstr "ENERGIE" +#: pedagogy/templates/pedagogy/guide.jinja:30 +#, fuzzy, python-format +#| msgid "credit type" +msgid "%(credit_type)s" +msgstr "type de crédit" -#: pedagogy/templates/pedagogy/guide.jinja:25 sith/settings.py:351 -msgid "IMSI" -msgstr "IMSI" - -#: pedagogy/templates/pedagogy/guide.jinja:26 sith/settings.py:353 -msgid "INFO" -msgstr "INFO" - -#: pedagogy/templates/pedagogy/guide.jinja:27 sith/settings.py:358 -msgid "GMC" -msgstr "GMC" - -#: pedagogy/templates/pedagogy/guide.jinja:28 -msgid "HUMA" -msgstr "HUMA" - -#: pedagogy/templates/pedagogy/guide.jinja:29 sith/settings.py:350 -msgid "TC" -msgstr "TC" - -#: pedagogy/templates/pedagogy/guide.jinja:32 sith/settings.py:410 -msgid "CS" -msgstr "CS" - -#: pedagogy/templates/pedagogy/guide.jinja:33 sith/settings.py:411 -msgid "TM" -msgstr "TM" - -#: pedagogy/templates/pedagogy/guide.jinja:34 sith/settings.py:414 -msgid "EC" -msgstr "EC" - -#: pedagogy/templates/pedagogy/guide.jinja:35 sith/settings.py:413 -msgid "QC" -msgstr "QC" - -#: pedagogy/templates/pedagogy/guide.jinja:36 sith/settings.py:412 -msgid "OM" -msgstr "OM" - -#: pedagogy/templates/pedagogy/guide.jinja:48 -#: pedagogy/templates/pedagogy/moderation.jinja:15 -#: pedagogy/templates/pedagogy/moderation.jinja:42 +#: pedagogy/templates/pedagogy/guide.jinja:43 +#: pedagogy/templates/pedagogy/moderation.jinja:12 msgid "UV" msgstr "UV" -#: pedagogy/templates/pedagogy/guide.jinja:50 +#: pedagogy/templates/pedagogy/guide.jinja:45 msgid "Department" msgstr "Département" -#: pedagogy/templates/pedagogy/guide.jinja:51 +#: pedagogy/templates/pedagogy/guide.jinja:46 msgid "Credit type" msgstr "Type de crédit" -#: pedagogy/templates/pedagogy/guide.jinja:204 +#: pedagogy/templates/pedagogy/guide.jinja:213 msgid "Error connecting to the server" msgstr "Erreur lors de la connection au serveur" -#: pedagogy/templates/pedagogy/macros.jinja:13 +#: pedagogy/templates/pedagogy/macros.jinja:12 msgid " not rated " msgstr "non noté" -#: pedagogy/templates/pedagogy/moderation.jinja:5 +#: pedagogy/templates/pedagogy/moderation.jinja:4 msgid "UV comment moderation" msgstr "Modération des commentaires d'UV" -#: pedagogy/templates/pedagogy/moderation.jinja:17 -#: pedagogy/templates/pedagogy/moderation.jinja:44 +#: pedagogy/templates/pedagogy/moderation.jinja:14 msgid "Reason" msgstr "Raison" -#: pedagogy/templates/pedagogy/moderation.jinja:34 -msgid "Delete comments" -msgstr "Supprimer commentaires" +#: pedagogy/templates/pedagogy/moderation.jinja:29 +msgid "Delete comment" +msgstr "Supprimer commentaire" -#: pedagogy/templates/pedagogy/moderation.jinja:61 +#: pedagogy/templates/pedagogy/moderation.jinja:30 msgid "Delete report" msgstr "Supprimer signalement" @@ -5017,83 +4977,81 @@ msgstr "Supprimer signalement" msgid "UV Details" msgstr "Détails d'UV" -#: pedagogy/templates/pedagogy/uv_detail.jinja:26 +#: pedagogy/templates/pedagogy/uv_detail.jinja:27 msgid "CM: " msgstr "CM : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:29 +#: pedagogy/templates/pedagogy/uv_detail.jinja:30 msgid "TD: " msgstr "TD : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:32 +#: pedagogy/templates/pedagogy/uv_detail.jinja:33 msgid "TP: " msgstr "TP : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:35 +#: pedagogy/templates/pedagogy/uv_detail.jinja:36 msgid "TE: " msgstr "TE : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:38 +#: pedagogy/templates/pedagogy/uv_detail.jinja:39 msgid "THE: " msgstr "THE : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:57 -#: pedagogy/templates/pedagogy/uv_detail.jinja:145 +#: pedagogy/templates/pedagogy/uv_detail.jinja:58 +#: pedagogy/templates/pedagogy/uv_detail.jinja:147 msgid "utility" msgstr "utilité" -#: pedagogy/templates/pedagogy/uv_detail.jinja:58 -#: pedagogy/templates/pedagogy/uv_detail.jinja:146 -#, fuzzy -#| msgid "Counters" +#: pedagogy/templates/pedagogy/uv_detail.jinja:59 +#: pedagogy/templates/pedagogy/uv_detail.jinja:148 msgid "interest" msgstr "intérêt" -#: pedagogy/templates/pedagogy/uv_detail.jinja:59 -#: pedagogy/templates/pedagogy/uv_detail.jinja:147 +#: pedagogy/templates/pedagogy/uv_detail.jinja:60 +#: pedagogy/templates/pedagogy/uv_detail.jinja:149 msgid "teaching" msgstr "enseignement" -#: pedagogy/templates/pedagogy/uv_detail.jinja:60 -#: pedagogy/templates/pedagogy/uv_detail.jinja:148 +#: pedagogy/templates/pedagogy/uv_detail.jinja:61 +#: pedagogy/templates/pedagogy/uv_detail.jinja:150 msgid "work load" msgstr "charge de travail" -#: pedagogy/templates/pedagogy/uv_detail.jinja:70 +#: pedagogy/templates/pedagogy/uv_detail.jinja:71 msgid "Objectives" msgstr "Objectifs" -#: pedagogy/templates/pedagogy/uv_detail.jinja:72 +#: pedagogy/templates/pedagogy/uv_detail.jinja:73 msgid "Program" msgstr "Programme" -#: pedagogy/templates/pedagogy/uv_detail.jinja:74 +#: pedagogy/templates/pedagogy/uv_detail.jinja:75 msgid "Earned skills" msgstr "Compétences acquises" -#: pedagogy/templates/pedagogy/uv_detail.jinja:76 +#: pedagogy/templates/pedagogy/uv_detail.jinja:77 msgid "Key concepts" msgstr "Concepts clefs" -#: pedagogy/templates/pedagogy/uv_detail.jinja:78 +#: pedagogy/templates/pedagogy/uv_detail.jinja:79 msgid "UV manager: " msgstr "Gestionnaire d'UV : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:84 +#: pedagogy/templates/pedagogy/uv_detail.jinja:85 msgid "Leave comment" msgstr "Laisser un commentaire" -#: pedagogy/templates/pedagogy/uv_detail.jinja:139 +#: pedagogy/templates/pedagogy/uv_detail.jinja:140 #: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:278 #: trombi/templates/trombi/export.jinja:70 msgid "Comments" msgstr "Commentaires" -#: pedagogy/templates/pedagogy/uv_detail.jinja:165 +#: pedagogy/templates/pedagogy/uv_detail.jinja:171 msgid "This comment has been reported" msgstr "Ce commentaire a été signalé" -#: pedagogy/templates/pedagogy/uv_detail.jinja:177 +#: pedagogy/templates/pedagogy/uv_detail.jinja:184 msgid "Report this comment" msgstr "Signaler ce commentaire" @@ -5222,10 +5180,22 @@ msgstr "Anglais" msgid "French" msgstr "Français" +#: sith/settings.py:350 +msgid "TC" +msgstr "TC" + +#: sith/settings.py:351 +msgid "IMSI" +msgstr "IMSI" + #: sith/settings.py:352 msgid "IMAP" msgstr "IMAP" +#: sith/settings.py:353 +msgid "INFO" +msgstr "INFO" + #: sith/settings.py:354 msgid "GI" msgstr "GI" @@ -5242,10 +5212,18 @@ msgstr "EE" msgid "GESC" msgstr "GESC" +#: sith/settings.py:358 +msgid "GMC" +msgstr "GMC" + #: sith/settings.py:359 msgid "MC" msgstr "MC" +#: sith/settings.py:360 +msgid "EDIM" +msgstr "EDIM" + #: sith/settings.py:361 msgid "Humanities" msgstr "Humanités" @@ -5282,6 +5260,26 @@ msgstr "Montbéliard" msgid "Free" msgstr "Libre" +#: sith/settings.py:410 +msgid "CS" +msgstr "CS" + +#: sith/settings.py:411 +msgid "TM" +msgstr "TM" + +#: sith/settings.py:412 +msgid "OM" +msgstr "OM" + +#: sith/settings.py:413 +msgid "QC" +msgstr "QC" + +#: sith/settings.py:414 +msgid "EC" +msgstr "EC" + #: sith/settings.py:415 msgid "RN" msgstr "RN" @@ -6055,6 +6053,12 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée." msgid "Maximum characters: %(max_length)s" msgstr "Nombre de caractères max: %(max_length)s" +#~ msgid "ENERGIE" +#~ msgstr "ENERGIE" + +#~ msgid "HUMA" +#~ msgstr "HUMA" + #~ msgid "Former website" #~ msgstr "Ancien site" diff --git a/pedagogy/templates/pedagogy/moderation.jinja b/pedagogy/templates/pedagogy/moderation.jinja index 7bcd71d2..61a2a617 100644 --- a/pedagogy/templates/pedagogy/moderation.jinja +++ b/pedagogy/templates/pedagogy/moderation.jinja @@ -1,63 +1,37 @@ {% extends "core/base.jinja" %} -{% from 'core/macros.jinja' import select_all_checkbox %} {% block title %} {% trans %}UV comment moderation{% endtrans %} {% endblock title %} {% block content %} -
- {% csrf_token %} -

{{ select_all_checkbox("moderation_delete_form") }}

- - - - - - - - - - - {% set queryset = form.accepted_reports.field.queryset %} - {% for widget in form.accepted_reports.subwidgets %} - {% set report = queryset.get(id=widget.data.value) %} +{{ form.errors }} +
{% trans %}UV{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}Reason{% endtrans %}{% trans %}Delete{% endtrans %}
+ + + + + + + + + + {% set queryset = form.accepted_reports.field.queryset %} + {% for widget in form.accepted_reports.subwidgets %} + {% set report = queryset.get(id=widget.data.value) %} + + {% csrf_token %} - + - {% endfor %} - -
{% trans %}UV{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}Reason{% endtrans %}{% trans %}Action{% endtrans %}
{{ report.comment.uv }} {{ report.comment.comment|markdown }} {{ report.reason|markdown }}{{ widget.tag() }} + + +
-

-
-
- {% csrf_token %} -

{{ select_all_checkbox("moderation_keep_form") }}

- - - - - - - - - - - {% set queryset = form.denied_reports.field.queryset %} - {% for widget in form.denied_reports.subwidgets %} - {% set report = queryset.get(id=widget.data.value) %} - - - - - - - {% endfor %} - -
{% trans %}UV{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}Reason{% endtrans %}{% trans %}Delete{% endtrans %}
{{ report.comment.uv }}{{ report.comment.comment|markdown }}{{ report.reason|markdown }}{{ widget.tag() }}
-

-
+ + {% endfor %} + + {% endblock content %}