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

Rend générique des affichages en fonction de tuto/article/billet #6548

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Rend générique des affichages en fonction de tuto/article/billet #6548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
897563d
Rend générique des affichages en fonction de tuto/article/billet
Arnaud-D Dec 23, 2022
2edec5d
Merge branch 'dev' into supprime-affichage-variable
philippemilink Nov 1, 2023
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
12 changes: 1 addition & 11 deletions templates/gallery/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,7 @@ <h3>{% trans "Actions" %}</h3>
{% if content_linked %}
<li>
<a href="{{ content_linked.get_absolute_url }}" class="ico-after offline blue">
{% trans "Aller" %}
{% if content_linked.type == "ARTICLE" %}
{% trans "à l’article" %}
{% elif content_linked.type == "TUTORIAL" %}
{% trans "au tutoriel" %}
{% elif content_linked.type == "OPINION" %}
{% trans "au billet" %}
{% else %}
{% trans "au contenu" %}
{% endif %}
{% trans "lié à cette galerie" %}
{% trans "Aller à la publication liée à cette galerie" %}
</a>
</li>
{% endif %}
Expand Down
11 changes: 1 addition & 10 deletions templates/gallery/gallery/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,7 @@
{% if gallery.linked_content in linked_contents %}
{% with content=linked_contents|get_item:gallery.linked_content %}
<p class="topic-last-answer">
{% trans "Liée" %}
{% if content.is_article %}
{% trans "à l’article" %}
{% elif content.is_tutorial %}
{% trans "au tutoriel" %}
{% elif content.is_opinion %}
{% trans "au billet" %}
{% else %}
{% trans "au contenu" %}
{% endif %}
{% trans "Liée à la publication" %}
«&NonBreakingSpace;<a href="{{ content.get_absolute_url }}">{{ content.title }}</a>&NonBreakingSpace;».
</p>
{% endwith %}
Expand Down
17 changes: 4 additions & 13 deletions templates/tutorialv2/includes/content/warn_typo.part.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,12 @@
{% if user.is_authenticated and user not in content.authors.all %}
<div class="warn-typo">
<a href="#warn-typo-modal" class="open-modal btn btn-grey ico-after edit blue">
{% trans "Signaler une faute dans" %}
{% if not container %}
{% if content.is_article %}
{% trans "cet article" %}
{% elif content.is_tutorial %}
{% trans "ce tutoriel" %}
{% elif content.is_opinion %}
{% trans "ce billet" %}
{% endif %}
{% trans "Signaler une faute dans cette publication" %}
{% elif container.is_chapter %}
{% trans "Signaler une faute dans ce chapitre" %}
{% else %}
{% if container.is_chapter %}
{% trans "ce chapitre" %}
{% else %}
{% trans "cette partie" %}
{% endif %}
{% trans "Signaler une faute dans cette partie" %}
{% endif %}
</a>

Expand Down