corrige le MP reçu

zestedesavoir · Nov 4, 2019 · f827c97 · f827c97
1 parent 4d1e97e
commit f827c97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/templates/tutorialv2/messages/add_contribution_pm.md b/templates/tutorialv2/messages/add_contribution_pm.md
@@ -3,7 +3,7 @@
 {% blocktrans with title=content.title|safe type=type|safe user=user|safe %}
 Bonjour {{ user }},
 
-Vous avez été désigné comme relecteur du contenu « [{{ title }}]({{ url }}) ».
+Vous avez été ajouté à la liste des contributeurs {{type}} « {{ title }} », en tant que {{role}}.
 
-Merci pour votre temps accordé à ce contenu !
+Merci pour votre participation !
 {%  endblocktrans %}
diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py
@@ -9,8 +9,8 @@
                                            DownloadContent, UpdateContentWithArchive, CreateContentFromArchive,
                                            ContentsWithHelps, AddAuthorToContent,
                                            RemoveAuthorFromContent, WarnTypo, DisplayBetaContent, DisplayBetaContainer,
-                                           ContentOfAuthor, RedirectOldContentOfAuthor, AddReviewerToContent,
-                                           RemoveReviewerFromContent, ContentOfContributors)
+                                           ContentOfAuthor, RedirectOldContentOfAuthor, AddContributorToContent,
+                                           RemoveContributorFromContent, ContentOfContributors)
 
 from zds.tutorialv2.views.published import (SendNoteFormView, UpdateNoteView,
                                             HideReaction, ShowReaction, SendNoteAlert, SolveNoteAlert, TagsListView,
@@ -148,9 +148,9 @@
     re_path(r'^comparaison/(?P<pk>\d+)/(?P<slug>.+)/$',
             DisplayDiff.as_view(), name='diff'),
     re_path(r'^ajouter-contributeur/(?P<pk>\d+)/$',
-            AddReviewerToContent.as_view(), name='add-contributor'),
+            AddContributorToContent.as_view(), name='add-contributor'),
     re_path(r'^enlever-contributeur/(?P<pk>\d+)/$',
-            RemoveReviewerFromContent.as_view(), name='remove-contributor'),
+            RemoveContributorFromContent.as_view(), name='remove-contributor'),
     re_path(r'^ajouter-auteur/(?P<pk>\d+)/$',
             AddAuthorToContent.as_view(), name='add-author'),
     re_path(r'^enlever-auteur/(?P<pk>\d+)/$',

diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py
@@ -1754,14 +1754,14 @@ def form_valid(self, form):
             return redirect(child.get_absolute_url())
 
 
-class AddReviewerToContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):
+class AddContributorToContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):
     only_draft_version = True
     must_be_author = True
     form_class = ContributionForm
     authorized_for_staff = True
 
     def get_form_kwargs(self):
-        kwargs = super(AddReviewerToContent, self).get_form_kwargs()
+        kwargs = super(AddContributorToContent, self).get_form_kwargs()
         kwargs.update({'content': self.object})
         return kwargs
 
@@ -1772,10 +1772,10 @@ def get(self, request, *args, **kwargs):
 
     def form_valid(self, form):
 
-        _type = _("de l'article")
+        _type = _("à l'article")
 
         if self.object.is_tutorial:
-            _type = _('du tutoriel')
+            _type = _('au tutoriel')
         elif self.object.is_opinion:
             raise PermissionDenied
 
@@ -1795,29 +1795,30 @@ def form_valid(self, form):
             send_mp(
                 bot,
                 [user],
-                format_lazy('{}{}', _('Aide à la relecture '), _type),
+                format_lazy('{} {}', _('Contribution'), _type),
                 self.versioned_object.title,
                 render_to_string('tutorialv2/messages/add_contribution_pm.md', {
                     'content': self.object,
                     'type': _type,
                     'url': self.object.get_absolute_url(),
                     'index': url_index,
-                    'user': user.username
+                    'user': user.username,
+                    'role': contribution.contribution_role.title
                 }),
                 True,
                 direct=False,
             )
             self.success_url = self.object.get_absolute_url()
 
-            return super(AddReviewerToContent, self).form_valid(form)
+            return super(AddContributorToContent, self).form_valid(form)
 
     def form_invalid(self, form):
         messages.error(self.request, form.errors)
         self.success_url = self.object.get_absolute_url()
-        return super(AddReviewerToContent, self).form_valid(form)
+        return super(AddContributorToContent, self).form_valid(form)
 
 
-class RemoveReviewerFromContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):
+class RemoveContributorFromContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):
 
     form_class = RemoveContributionForm
     only_draft_version = True
@@ -1836,15 +1837,15 @@ def form_valid(self, form):
         contribution.delete()
 
         messages.success(
-            self.request, _('Vous avez enlevé {} de la liste des relecteurs de {}.').format(user.username, _type))
+            self.request, _('Vous avez enlevé {} de la liste des contributeurs de {}.').format(user.username, _type))
         self.success_url = self.object.get_absolute_url()
 
-        return super(RemoveReviewerFromContent, self).form_valid(form)
+        return super(RemoveContributorFromContent, self).form_valid(form)
 
     def form_invalid(self, form):
         messages.error(self.request, _("Les relecteurs sélectionnés n'existent pas."))
         self.success_url = self.object.get_absolute_url()
-        return super(RemoveReviewerFromContent, self).form_valid(form)
+        return super(RemoveContributorFromContent, self).form_valid(form)
 
 
 class AddAuthorToContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):