Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update editorialization.py #6381

Merged
merged 3 commits into from
Oct 10, 2022
+6 −6
Merged

Update editorialization.py #6381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbddd5f
Update editorialization.py
qwertygc Aug 19, 2022
bd1f8e7
Merge branch 'dev' into patch-2
Arnaud-D Oct 10, 2022
ce3252b
Corrige le test
Arnaud-D Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zds/tutorialv2/tests/tests_views/tests_addsuggestion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def setUp(self):
self.success_message_fragment = _("a été ajouté dans les suggestions")
self.error_message_fragment_unpublished = _("un contenu qui n'a pas été publié")
self.error_message_fragment_already_suggested = _("fait déjà partie des suggestions de")
self.error_message_fragment_self = _("en tant que suggestion pour lui même")
self.error_message_fragment_self = _("en tant que suggestion pour lui-même")
self.error_messge_fragment_not_picked = _("un billet qui n'a pas été mis en avant")

# Log in with an authorized user to perform the tests
Expand Down
10 changes: 5 additions & 5 deletions zds/tutorialv2/views/editorialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,22 @@ def post(self, request, *args, **kwargs):
if ContentSuggestion.objects.filter(publication=publication, suggestion=suggestion).exists():
messages.error(
self.request,
_(f'Le contenu "{suggestion.title}" fait déjà partie des suggestions de {_type}'),
_(f'Le contenu "{suggestion.title}" fait déjà partie des suggestions de {_type}.'),
)
elif suggestion.pk == publication.pk:
messages.error(
self.request,
_(f"Vous ne pouvez pas ajouter {_type} en tant que suggestion pour lui même."),
_(f"Vous ne pouvez pas ajouter {_type} en tant que suggestion pour lui-même."),
)
elif suggestion.is_opinion and suggestion.sha_picked != suggestion.sha_public:
messages.error(
self.request,
_(f"Vous ne pouvez pas suggerer pour {_type} un billet qui n'a pas été mis en avant."),
_(f"Vous ne pouvez pas suggérer pour {_type} un billet qui n'a pas été mis en avant."),
)
elif not suggestion.sha_public:
messages.error(
self.request,
_(f"Vous ne pouvez pas suggerer pour {_type} un contenu qui n'a pas été publié."),
_(f"Vous ne pouvez pas suggérer pour {_type} un contenu qui n'a pas été publié."),
)
else:
obj_suggestion = ContentSuggestion(publication=publication, suggestion=suggestion)
Expand All @@ -108,7 +108,7 @@ def post(self, request, *args, **kwargs):
)
messages.info(
self.request,
_(f'Le contenu "{suggestion.title}" a été ajouté dans les suggestions de {_type}'),
_(f'Le contenu "{suggestion.title}" a été ajouté dans les suggestions de {_type}.'),
)

if self.object.public_version:
Expand Down