From 3dd1905f772061a79f3ae975be02ddc0692807fe Mon Sep 17 00:00:00 2001
From: Martin Aarhof <martin.aarhof@gmail.com>
Date: Sun, 31 Dec 2017 14:42:46 +0100
Subject: [PATCH 1/3] Sorting message files, so they are similar on all
 languages

---
 Resources/views/WebUI/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/WebUI/index.html.twig b/Resources/views/WebUI/index.html.twig
index b2b4f178..44d91725 100644
--- a/Resources/views/WebUI/index.html.twig
+++ b/Resources/views/WebUI/index.html.twig
@@ -8,7 +8,7 @@
         <div class="catalouge">
             <h3>{{ localeMap[cataloge.locale] }}</h3>
             <table class="domain-table">
-            {% for domain,messages in cataloge.all %}
+            {% for domain,messages in cataloge.all|sort %}
                 {% set pg = maxDomainSize[domain] %}
                 {% if pg > 0 %}
                     {% set pg = (pg/messages|length)|round(2)*100 %}

From 0d8a84494f8009212bab4e88fd703104a1ef5da6 Mon Sep 17 00:00:00 2001
From: Martin Aarhof <martin.aarhof@gmail.com>
Date: Sun, 31 Dec 2017 14:46:24 +0100
Subject: [PATCH 2/3] Moved message count from controller to twig, due to it
 affected the total count, Some more details

---
 Controller/WebUIController.php        |  4 +---
 Resources/views/WebUI/index.html.twig | 34 ++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php
index dc1f9c2a..89d53a31 100644
--- a/Controller/WebUIController.php
+++ b/Controller/WebUIController.php
@@ -58,9 +58,7 @@ public function indexAction($configName = null)
             ksort($domains);
             $catalogueSize[$locale] = 0;
             foreach ($domains as $domain => $messages) {
-                $count = count(array_filter($messages, function ($message) {
-                    return '' !== $message;
-                }));
+                $count = count($messages);
                 $catalogueSize[$locale] += $count;
                 if (!isset($maxDomainSize[$domain]) || $count > $maxDomainSize[$domain]) {
                     $maxDomainSize[$domain] = $count;
diff --git a/Resources/views/WebUI/index.html.twig b/Resources/views/WebUI/index.html.twig
index 44d91725..0a664f89 100644
--- a/Resources/views/WebUI/index.html.twig
+++ b/Resources/views/WebUI/index.html.twig
@@ -8,10 +8,18 @@
         <div class="catalouge">
             <h3>{{ localeMap[cataloge.locale] }}</h3>
             <table class="domain-table">
+            {% set totalMessages = 0 %}
+            {% set translatedMessages = 0 %}
             {% for domain,messages in cataloge.all|sort %}
-                {% set pg = maxDomainSize[domain] %}
-                {% if pg > 0 %}
-                    {% set pg = (pg/messages|length)|round(2)*100 %}
+                {% set pg = 0 %}
+                {% set translated = 0 %}
+                {% for message in messages %}
+                    {% if message != '' %}
+                        {% set translated = translated + 1 %}
+                    {% endif %}
+                {% endfor %}
+                {% if translated > 0 %}
+                    {% set pg = (translated/messages|length*100)|round(2) %}
                 {% endif %}
                 <tr>
                     <td>
@@ -23,13 +31,27 @@
                         {{ macro.progress(pg, "") }}
                     </td>
                     <td>
-                        {{ pg }} %
+                        <small>({{ translated }} / {{ messages|length }})</small>
+                        <b>{{ pg }} %</b>
                     </td>
                 </tr>
+                {% set totalMessages = totalMessages + messages|length %}
+                {% set translatedMessages = translatedMessages + translated %}
             {% endfor %}
             </table>
-            {% set pg = (100*catalogueSize[cataloge.locale]/maxCatalogueSize)|round %}
-            <div class="text-xs-center">Total progress for this language: {{ pg }}%</div>
+            {% if translatedMessages == 0 and totalMessages == 0 %}
+                {% set pg = 100 %}
+            {% elseif translatedMessages > 0 and totalMessages > 0 %}
+                {% set pg = (translatedMessages/totalMessages*100)|round(2) %}
+            {% elseif translatedMessages > 0 or totalMessages > 0 %}
+                {% set pg = 0 %}
+            {% endif %}
+
+            <div class="text-xs-center">
+                Total progress for this language:
+                <small>({{ translatedMessages }} / {{ totalMessages }})</small>
+                <b>{{ pg }}%</b>
+            </div>
             {{ macro.progress(pg, "total-progressbar") }}
         </div>
     {% endfor %}

From 865984382a2fda9bbf167c3a64abb8f639ff30e0 Mon Sep 17 00:00:00 2001
From: Martin Aarhof <martin.aarhof@gmail.com>
Date: Sun, 31 Dec 2017 15:21:17 +0100
Subject: [PATCH 3/3] Cleaned up the total check

---
 Resources/views/WebUI/index.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/views/WebUI/index.html.twig b/Resources/views/WebUI/index.html.twig
index 0a664f89..dcc92ae9 100644
--- a/Resources/views/WebUI/index.html.twig
+++ b/Resources/views/WebUI/index.html.twig
@@ -39,11 +39,11 @@
                 {% set translatedMessages = translatedMessages + translated %}
             {% endfor %}
             </table>
-            {% if translatedMessages == 0 and totalMessages == 0 %}
+            {% if totalMessages == 0 %}
                 {% set pg = 100 %}
             {% elseif translatedMessages > 0 and totalMessages > 0 %}
                 {% set pg = (translatedMessages/totalMessages*100)|round(2) %}
-            {% elseif translatedMessages > 0 or totalMessages > 0 %}
+            {% else %}
                 {% set pg = 0 %}
             {% endif %}