From a610644b82fc8ac033981ea0e5ce60b5dbf4b34a Mon Sep 17 00:00:00 2001
From: Dwayne Bailey <dwayne@translate.org.za>
Date: Tue, 29 Nov 2016 22:29:09 +0000
Subject: [PATCH] Use formated numbers in tables and stats

humanize.intcomma turns 1000 into 1,000 as required
---
 pootle/templates/browser/_actions.html | 18 +++++++++---------
 pootle/templates/browser/_table.html   | 18 +++++++++---------
 pootle/templates/browser/index.html    | 10 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pootle/templates/browser/_actions.html b/pootle/templates/browser/_actions.html
index 4be85de82b2..69b7da061ac 100644
--- a/pootle/templates/browser/_actions.html
+++ b/pootle/templates/browser/_actions.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n humanize %}
 {% if stats.total %}
 <ul>
   {% if stats.critical %}
@@ -6,12 +6,12 @@
     {% if url_action_fixcritical %}
     <a class="fix-errors" href="{{ url_action_fixcritical }}">
       <span class="caption">{% trans 'Fix critical errors' %}</span>
-      <span class="counter">{{ stats.critical }}</span>
+      <span class="counter">{{ stats.critical|intcomma }}</span>
     </a>
     {% else %}
     <span class="fix-errors">
       <span class="caption">{% trans 'Critical errors' %}</span>
-      <span class="counter">{{ stats.critical }}</span>
+      <span class="counter">{{ stats.critical|intcomma }}</span>
     </span>
     {% endif %}
   </li>
@@ -21,12 +21,12 @@
     {% if url_action_review %}
     <a class="review-suggestions" href="{{ url_action_review }}">
       <span class="caption">{% trans 'Review suggestions' %}</span>
-      <span class="counter">{{ stats.suggestions }}</span>
+      <span class="counter">{{ stats.suggestions|intcomma }}</span>
     </a>
     {% else %}
     <span class="review-suggestions">
       <span class="caption">{% trans 'Suggestions' %}</span>
-      <span class="counter">{{ stats.suggestions }}</span>
+      <span class="counter">{{ stats.suggestions|intcomma }}</span>
     </span>
     {% endif %}
   </li>
@@ -36,12 +36,12 @@
     {% if url_action_continue %}
     <a class="continue-translation" href="{{ url_action_continue }}">
       <span class="caption">{% trans 'Continue translation' %}</span>
-      <span class="counter">{{ stats.incomplete }}</span>
+      <span class="counter">{{ stats.incomplete|intcomma }}</span>
     </a>
     {% else %}
     <span class="continue-translation">
       <span class="caption">{% trans 'Incomplete' %}</span>
-      <span class="counter">{{ stats.incomplete }}</span>
+      <span class="counter">{{ stats.incomplete|intcomma }}</span>
     </span>
     {% endif %}
   </li>
@@ -51,12 +51,12 @@
     {% if url_action_view_all %}
     <a class="translation-complete"{% if url_action_view_all %} href="{{ url_action_view_all }}"{% endif %}>
       <span class="caption">{% trans 'View all' %}</span>
-      <span class="counter">{{ stats.total }}</span>
+      <span class="counter">{{ stats.total|intcomma }}</span>
     </a>
     {% else %}
     <span class="translation-complete">
       <span class="caption">{% trans 'All' %}</span>
-      <span class="counter">{{ stats.total }}</span>
+      <span class="counter">{{ stats.total|intcomma }}</span>
     </span>
     {% endif %}
   </li>
diff --git a/pootle/templates/browser/_table.html b/pootle/templates/browser/_table.html
index 9b135c64d76..bf31f8152c2 100644
--- a/pootle/templates/browser/_table.html
+++ b/pootle/templates/browser/_table.html
@@ -1,5 +1,5 @@
 {% load i18n locale cache %}
-{% load common_tags profile_tags %}
+{% load common_tags profile_tags humanize %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
@@ -67,9 +67,9 @@
       {% if 'critical' in table.fields %}
       <td id="critical-{{ item.code|cssid }}" class="stats-number critical{% if not item.stats.critical %} zero{% endif %}">
         {% if can_translate and item.stats.critical %}
-        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=checks&category=critical{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.critical }}</a>
+        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=checks&category=critical{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.critical|intcomma }}</a>
         {% else %}
-        <span class="{% if item.stats.critical %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.critical }}</span>
+        <span class="{% if item.stats.critical %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.critical|intcomma }}</span>
         {% endif %}
       </td>
       {% endif %}
@@ -77,9 +77,9 @@
       {% if 'suggestions' in table.fields %}
       <td id="suggestions-{{ item.code|cssid }}" class="stats-number suggestions{% if not item.stats.suggestions %} zero{% endif %}">
         {% if can_translate and item.stats.suggestions %}
-        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=suggestions{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.suggestions }}</a>
+        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=suggestions{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.suggestions|intcomma }}</a>
         {% else %}
-        <span class="{% if item.stats.suggestions %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.suggestions }}</span>
+        <span class="{% if item.stats.suggestions %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.suggestions|intcomma }}</span>
         {% endif %}
       </td>
       {% endif %}
@@ -87,9 +87,9 @@
       {% if 'need-translation' in table.fields %}
       <td id="need-translation-{{ item.code|cssid }}" class="stats-number need-translation{% if not item.stats.incomplete %} zero{% endif %}">
         {% if can_translate and item.stats.incomplete %}
-        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=incomplete{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.incomplete }}</a>
+        <a class="stats-data non-zero" href="{{ item.href_translate }}#filter=incomplete{% if item.sort %}&sort={{ item.sort }}{% endif %}">{{ item.stats.incomplete|intcomma }}</a>
         {% else %}
-        <span class="{% if item.stats.incomplete %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.incomplete }}</span>
+        <span class="{% if item.stats.incomplete %}stats-data non-zero{% else %}zero muted{% endif %}">{{ item.stats.incomplete|intcomma }}</span>
         {% endif %}
       </td>
       {% endif %}
@@ -97,9 +97,9 @@
       {% if 'total' in table.fields %}
       <td id="total-words-{{ item.code|cssid }}" class="stats-number total not-inited">
         {% if can_translate %}
-        <a class="stats-data non-zero" href="{{ item.href_translate }}{% if item.sort %}#sort={{ item.sort }}{% endif %}">{{ item.stats.total }}</a>
+        <a class="stats-data non-zero" href="{{ item.href_translate }}{% if item.sort %}#sort={{ item.sort }}{% endif %}">{{ item.stats.total|intcomma }}</a>
         {% else %}
-        <span class="stats-data non-zero">{{ item.stats.total }}</span>
+        <span class="stats-data non-zero">{{ item.stats.total|intcomma }}</span>
         {% endif %}
       </td>
       {% endif %}
diff --git a/pootle/templates/browser/index.html b/pootle/templates/browser/index.html
index f1c29bdcf20..5e0164c5e38 100644
--- a/pootle/templates/browser/index.html
+++ b/pootle/templates/browser/index.html
@@ -1,6 +1,6 @@
 {% extends browser_extends %}
 
-{% load core assets cleanhtml i18n locale common_tags profile_tags %}
+{% load core assets cleanhtml i18n locale common_tags profile_tags humanize %}
 
 {% get_current_language as LANGUAGE_CODE %}
 {% get_current_language_bidi as LANGUAGE_BIDI %}
@@ -32,9 +32,9 @@ <h3 class="top">{% trans "Translation Statistics" %}</h3>
                 <td id="stats-name">{{ item.title }}</td>
                 <td class="stats-number">
                   {% if can_translate_stats %}
-                  <a href="{{ item.url }}" class="stats-data">{{ item.count }}</a>
+                  <a href="{{ item.url }}" class="stats-data">{{ item.count|intcomma }}</a>
                   {% else %}
-                  <span class="stats-data">{{ item.count }}</span>
+                  <span class="stats-data">{{ item.count|intcomma }}</span>
                   {% endif %}
                 </td>
                 <td class="stats-percentage"><span>{{ item.percent }}</span>%</td>
@@ -54,10 +54,10 @@ <h3>{% trans "Failing Checks" %}</h3>
                 <td class="check-name">
                   <a class="check-data" href="{{ check.url }}">{{ check.title }}</a>
                 </td>
-                <td class="check-count"><a class="check-data" href="{{ check.url }}">{{ check.count }}</a></td>
+                <td class="check-count"><a class="check-data" href="{{ check.url }}">{{ check.count|intcomma }}</a></td>
                 {% else %}
                 <td class="check-name"><span class="check-data">{{ check.title }}</span></td>
-                <td class="check-count"><span class="check-data">{{ check.count }}</span></td>
+                <td class="check-count"><span class="check-data">{{ check.count|intcomma }}</span></td>
                 {% endif %}
               </tr>
             {% endfor %}