diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-02-24 13:36:08 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-02-26 18:14:42 +0100 |
commit | a772d16b12ee84e8d0810c65b26664e8364b4047 (patch) | |
tree | e3020652eb7340d3283fb3d6aa0915d3593171b1 | |
parent | 2b6e65a5e367deff3df333e5a79c5d23a484ae01 (diff) | |
download | wallabag-a772d16b12ee84e8d0810c65b26664e8364b4047.tar.gz wallabag-a772d16b12ee84e8d0810c65b26664e8364b4047.tar.zst wallabag-a772d16b12ee84e8d0810c65b26664e8364b4047.zip |
display how much comments there are for an entry
3 files changed, 5 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 39e14a7e..2037321e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -98,6 +98,7 @@ Toggle favorite: 'Marquer comme favori' | |||
98 | Delete: 'Supprimer' | 98 | Delete: 'Supprimer' |
99 | "{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." | 99 | "{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." |
100 | http://website: "http://siteweb" | 100 | http://website: "http://siteweb" |
101 | "{0} No annotations|{1} One annotation|]1,Inf[ %nbComments% annotations": "{0} Aucun commentaire|{1} Un commentaire|]1,Inf[ %nbComments% commentaires" | ||
101 | 102 | ||
102 | # Edit entry | 103 | # Edit entry |
103 | Edit an entry: "Éditer un article" | 104 | Edit an entry: "Éditer un article" |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 988cbd29..817e39b8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -29,7 +29,8 @@ | |||
29 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li> | 29 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li> |
30 | </ul> | 30 | </ul> |
31 | </div> | 31 | </div> |
32 | 32 | {% set nbComments = entry.comments | length %} | |
33 | <span class="tool link mdi-communication-comment"> {% transchoice nbComments %}{0} No annotations|{1} One annotation|]1,Inf[ %nbComments% annotations{% endtranschoice %}</span> | ||
33 | <aside class="tags"> | 34 | <aside class="tags"> |
34 | {% for tag in entry.tags %} | 35 | {% for tag in entry.tags %} |
35 | <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a> | 36 | <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index c2bbd845..4839c3ea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -187,6 +187,8 @@ main { | |||
187 | </header> | 187 | </header> |
188 | <aside> | 188 | <aside> |
189 | <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 189 | <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> |
190 | {% set nbComments = entry.comments | length %} | ||
191 | <span class="tool link mdi-communication-comment"> {% transchoice nbComments %}{0} No annotations|{1} One annotation|]1,Inf[ %nbComments% annotations{% endtranschoice %}</span> | ||
190 | <div id="list"> | 192 | <div id="list"> |
191 | {% for tag in entry.tags %} | 193 | {% for tag in entry.tags %} |
192 | <div class="chip"> | 194 | <div class="chip"> |