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

Jump to bottom

Messages d'information erronés au sujet d'un article #3437

Merged
merged 1 commit into from
Mar 19, 2016
Merged

Messages d'information erronés au sujet d'un article #3437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions templates/tutorialv2/view/content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ <h2 class="subtitle">
{% if validation.version == content.current_version %}
{% if validation.is_pending %}
<p class="content-wrapper alert-box alert">
{% trans "Ce tutoriel est en attente d'un validateur" %}
{% trans "Ce contenu est en attente d'un validateur." %}
</p>
{% elif validation.is_pending_valid %}
<p class="content-wrapper alert-box info">
{% trans "Le tutoriel est en cours de validation par" %}
{% trans "Ce contenu est en cours de validation par" %}
{% include "misc/member_item.part.html" with member=validation.validator %}
</p>
{% endif %}
Expand All @@ -73,13 +73,15 @@ <h2 class="subtitle">
{% if validation.is_pending %}
<p class="content-wrapper alert-box alert">
<a href="{{ object.get_absolute_url }}?version={{ validation.version }}">
{% trans "Une autre version de ce tutoriel" %}</a>
{% trans "Une autre version de ce contenu" %}
</a>
{% trans "est en attente d'un validateur" %}
</p>
{% elif validation.is_pending_valid %}
<p class="content-wrapper alert-box info">
<a href="{{ content.get_absolute_url }}?version={{ validation.version }}">
{% trans "Une autre version de ce tutoriel" %}</a>
{% trans "Une autre version de ce contenu" %}
</a>
{% trans "est en cours de validation par" %}
{% include "misc/member_item.part.html" with member=validation.validator %}
</p>
Expand Down Expand Up @@ -131,12 +133,7 @@ <h2 class="subtitle">
{% include "tutorialv2/includes/child.part.html" with child=child %}
{% empty %}
<p class="ico-after warning">
{% if content.is_article %}
{% trans "Cet article" %}
{% else %}
{% trans "Ce tutoriel" %}
{% endif %}
{% trans " est actuellement vide" %}.
{% trans "Ce contenu est actuellement vide" %}.
</p>
{% endfor %}

Expand Down Expand Up @@ -249,7 +246,7 @@ <h2 class="subtitle">
<input type="hidden" name="version" value="{% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}">
<p>
{% blocktrans with content_title=content.title %}
Êtes-vous certain de vouloir <strong>activer</strong> la bêta du tutoriel
Êtes-vous certain de vouloir <strong>activer</strong> la bêta de ce contenu
"<em>{{ content_title }}</em>" dans la version que vous voyez actuellement ?
{% endblocktrans %}
</p>
Expand All @@ -276,7 +273,7 @@ <h2 class="subtitle">
<input type="hidden" name="version" value="{% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}">
<p>
{% blocktrans with content_title=content.title %}
Êtes-vous certain de vouloir <strong>mettre à jour</strong> la bêta du tutoriel
Êtes-vous certain de vouloir <strong>mettre à jour</strong> la bêta de ce contenu
"<em>{{ content_title }}</em>" dans la version que vous voyez actuellement ?
{% endblocktrans %}
</p>
Expand Down Expand Up @@ -306,7 +303,7 @@ <h2 class="subtitle">
<input type="hidden" name="version" value="{% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}">
<p>
{% blocktrans with content_title=content.title %}
Êtes-vous certain de vouloir <strong>désactiver</strong> la bêta du tutoriel "<em>{{ content_title }}</em>" ?
Êtes-vous certain de vouloir <strong>désactiver</strong> la bêta de ce contenu "<em>{{ content_title }}</em>" ?
{% endblocktrans %}
</p>
<button type="submit">
Expand Down Expand Up @@ -460,7 +457,9 @@ <h3>{% trans "Validation" %}</h3>
<form action="{% url "validation:reserve" validation.pk %}" method="post" class="modal modal-flex" id="unreservation">
{% csrf_token %}
<p>
{% trans "La validation de ce tutoriel est actuellement réservée par" %} {% include "misc/member_item.part.html" with member=validation.validator %}. {% trans "Êtes-vous certain de vouloir le retirer" %} ?
{% trans "La validation de ce contenu est actuellement réservée par" %}
{% include "misc/member_item.part.html" with member=validation.validator %}.
{% trans "Êtes-vous certain de vouloir le retirer" %} ?
</p>
<button type="submit">
{% trans "Confirmer" %}
Expand Down
2 changes: 1 addition & 1 deletion zds/tutorialv2/views/views_validations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ def form_valid(self, form):
direct=False
)

messages.success(self.request, _(u"Le tutoriel a bien été dépublié."))
messages.success(self.request, _(u"Le contenu a bien été dépublié."))
self.success_url = self.versioned_object.get_absolute_url() + "?version=" + validation.version

return super(RevokeValidation, self).form_valid(form)