From 37c674b5eb62597aa9db6cda5d139ef490e688f7 Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Wed, 20 Jan 2016 11:46:38 +0100
Subject: [PATCH] PHRAS-913 - fix counter display in users lists

---
 templates/web/prod/actions/Feedback/ListsMacros.html.twig | 4 ++--
 templates/web/prod/actions/Feedback/list.html.twig        | 4 ++--
 templates/web/prod/actions/Feedback/lists-all.html.twig   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index 67bcf92c7b..5ca64d045d 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -86,8 +86,8 @@
     </table>
   </div>
   <div class="PNB" style="top:auto;height:20px;text-align:right;line-height:20px;">
-    {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
-    {% trans with {'%length%' : length} %}%length% peoples{% endtrans %}
+    {% set length = list.getEntries().count() %}
+    <span class="counter current">{% trans with {'%length%' : length} %}%length% peoples{% endtrans %}</span>
     {% if query.get_page() > 1 %}
       <a class="prev" value="{{ query.get_page() - 1 }}" href="#">< {{ 'Previous' | trans }}</a>
     {% endif %}
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index 036e110f14..1d21cee1a8 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -37,8 +37,8 @@
         <div class="PNB10">
             <div class="PNB" style="height:25px; bottom:auto;">
                 <p>
-                    {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
-                    {% trans with {'%length%' : length} %}%length% peoples{% endtrans %}
+                    {% set length = ist.getEntries().count() %}
+                    <span class="counter current">{% trans with {'%length%' : length} %}%length% peoples{% endtrans %}</span>
                     {% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
                         <button class="EditToggle btn btn-inverse">{{ 'Edit' | trans }}</button>
                     {% endif %}
diff --git a/templates/web/prod/actions/Feedback/lists-all.html.twig b/templates/web/prod/actions/Feedback/lists-all.html.twig
index 51bd55a5ae..be0b909489 100644
--- a/templates/web/prod/actions/Feedback/lists-all.html.twig
+++ b/templates/web/prod/actions/Feedback/lists-all.html.twig
@@ -11,7 +11,6 @@
         </span>
         <ul class="lists">
           {% for list in lists %}
-            {% set length = '<span class="counter">' ~ list.getEntries().count() ~ '</span>' %}
             <li class="list" style="padding:2px;">
               <a href="{{ path('prod_push_list_edit', { 'list_id' : list.getId() }) }}" class="list_link">
                 {% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
@@ -20,7 +19,7 @@
                   <img src="/assets/common/images/icons/SHARE16.png" />
                 {% endif %}
                 {{ list.getName() }}
-                ({{ length }})
+                <span class="counter">({{ list.getEntries().count() }})</span>
               </a>
             </li>
           {% endfor %}