Retire pluralize et ajoute un compteur

zestedesavoir · Jul 27, 2014 · 8746310 · 8746310
1 parent a81cb8d
commit 8746310
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/templates/article/validation/index.html b/templates/article/validation/index.html
@@ -49,6 +49,7 @@ <h3>Filtres</h3>
         <h2>
             {% block headline %}
                 Validation des articles
+                ({{ validations|length }})
             {% endblock %}
         </h2>
 
@@ -72,7 +73,7 @@ <h2>
                                     </a>
                                     <br>
                                     {% if validation.article.subcategory.all %}
-                                        Catégorie{{ validation.article.subcategory.all|pluralize }} : 
+                                        Catégories : 
                                         {% for subcategory in validation.article.subcategory.all %}
                                             {% if not forloop.first %}
                                                 -

diff --git a/templates/tutorial/includes/tutorial_item.part.html b/templates/tutorial/includes/tutorial_item.part.html
@@ -17,6 +17,9 @@ <h3 itemprop="itemListElement">{{ tutorial.title }}</h3>
             <span class="article-metadata">
                 {% if tutorial.subcategory %}
                     {% for category in tutorial.subcategory.all %}
+                        {% if not forloop.first %}
+                            -
+                        {% endif %}
                         {{ category.title }}                                    
                     {% endfor %}
                 {% endif %}

diff --git a/templates/tutorial/validation/index.html b/templates/tutorial/validation/index.html
@@ -31,6 +31,7 @@ <h1>
                 {% elif request.GET.type == "orphan" %}
                     / Non-reservés
                 {% endif %}
+                ({{ validations|length }})
             {% endblock %}
         </h1>
 
@@ -61,7 +62,7 @@ <h2 class="subtitle">{{ headlinesub|safe }}</h2>
                                     </a>
                                     <br>
                                     {% if validation.tutorial.subcategory.all %}
-                                        Catégorie{{ validation.article.subcategory.all|pluralize }} : 
+                                        Catégories : 
                                         {% for subcategory in validation.tutorial.subcategory.all %}
                                             {% if not forloop.first %}
                                                 -