Merge ~cristiangsp/launchpad:bugfix-1158242-translations-ui-changes into launchpad:master

[Cristian Gonzalez]

Redistributing "Contributors" and "Length" columns on Translations

This branch introduces the 2 changes requested in bug: https://bugs.launchpad.net/launchpad/+bug/1158242

- Moving the "Contributors" column to the end of the table in the distribution's Translations page.
- Converting the "Length" column into "Total" an move it to the end of the table in the distribution series language page.

[Colin Watson (cjwatson)]

It doesn't show clearly in the web UI, but looks like you've added some spurious trailing whitespace on five lines (more easily visible in `git diff`). Could you remove that again? (Obviously a minor point.)

The actual change looks fine to me, but to my relief there is at least a small amount of test suite fallout that you'll need to adjust to match:

Failure in test lib/lp/translations/stories/translations/xx-translations.txt
Failed doctest test for xx-translations.txt
  File "lib/lp/translations/stories/translations/xx-translations.txt", line 0

----------------------------------------------------------------------
File "lib/lp/translations/stories/translations/xx-translations.txt", line 238, in xx-translations.txt
Failed example:
    print(extract_text(evolution_line))
Differences (ndiff with -expected +actual):
      evolution-2.2
    - ...
    - 15 1 1
    - ...
    + 15
    + 1
    + 1
    + 22
    + 2005-06-06
    + Valentina Commissari

Looks like the first of the two ellipses in this doctest example should probably be dropped to match the change in the page template.

Please also link the bug report to this MP. You can do that after the fact using the "Link a bug report" facility here, or (better, for future MPs) mention the bug number in a commit message using the style shown in https://help.launchpad.net/Code/Git#Linking_to_bugs so that it can be automatically linked.

review: Needs Fixing

[Colin Watson (cjwatson)]

Also, I'd generally prefer that the "Commit message" field of the merge proposal conform to the recommendations for subject lines in https://chris.beams.io/posts/git-commit/.

And thanks for your first Launchpad MP!

118fa9c... by Cristian Gonzalez on 2020-11-12

Fixing addition of extra blank spaces

8276039... by Cristian Gonzalez on 2020-11-16

Fixing translations UI test

[Cristian Gonzalez (cristiangsp)]

Suggested fixes applied and now test are green too.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/translations/stories/translations/xx-translations.txt b/lib/lp/translations/stories/translations/xx-translations.txt
index f2cd87d..928b0b3 100644
--- a/lib/lp/translations/stories/translations/xx-translations.txt
+++ b/lib/lp/translations/stories/translations/xx-translations.txt
@@ -237,7 +237,6 @@ Looking at the Spanish language overview page, we can see that there are
     >>> evolution_line = find_tag_by_id(browser.contents, 'evolution-2.2')
     >>> print(extract_text(evolution_line))
     evolution-2.2
-    ...
     15 1 1
     ...
 
diff --git a/lib/lp/translations/templates/distroseries-langchart.pt b/lib/lp/translations/templates/distroseries-langchart.pt
index 47f9a40..28ef0bf 100644
--- a/lib/lp/translations/templates/distroseries-langchart.pt
+++ b/lib/lp/translations/templates/distroseries-langchart.pt
@@ -21,11 +21,11 @@
     <thead>
       <tr>
         <th>Language</th>
-        <th>Contributors</th>
         <th>Status</th>
         <th>Untranslated</th>
         <th>Need review</th>
         <th>Changed</th>
+        <th>Contributors</th>
       </tr>
     </thead>
 
@@ -48,15 +48,6 @@
              Language Name
           </a>
         </td>
-        <td>
-          <span class="sortkey" tal:content="drlang/contributor_count">0</span>
-          <tal:count
-            tal:condition="drlang/contributor_count"
-            tal:replace="drlang/contributor_count">0</tal:count>
-          <tal:count condition="not: drlang/contributor_count">
-            &mdash;
-          </tal:count>
-        </td>
         <td style="white-space: nowrap">
           <div tal:replace="structure drlang/@@+barchart" />
         </td>
@@ -87,6 +78,15 @@
             &mdash;
           </tal:count>
         </td>
+        <td>
+          <span class="sortkey" tal:content="drlang/contributor_count">0</span>
+          <tal:count
+            tal:condition="drlang/contributor_count"
+            tal:replace="drlang/contributor_count">0</tal:count>
+          <tal:count condition="not: drlang/contributor_count">
+            &mdash;
+          </tal:count>
+        </td>
       </tr>
       </tal:loop>
     </tbody>
diff --git a/lib/lp/translations/templates/serieslanguage-index.pt b/lib/lp/translations/templates/serieslanguage-index.pt
index 6c59d4f..42fbdc2 100644
--- a/lib/lp/translations/templates/serieslanguage-index.pt
+++ b/lib/lp/translations/templates/serieslanguage-index.pt
@@ -66,11 +66,11 @@
       <thead>
         <tr>
           <th>Template Name</th>
-          <th>Length</th>
           <th>Status</th>
           <th>Untranslated</th>
           <th>Need review</th>
           <th>Changed</th>
+          <th>Total</th>
           <th>Last Edited</th>
           <th>By</th>
         </tr>
@@ -84,7 +84,6 @@
                apache2-dev
             </a>
           </td>
-          <td tal:content="entry/potemplate/messageCount">87</td>
           <td>
             <tal:comment condition="nothing">
               This text is used for the sorting.
@@ -138,6 +137,7 @@
                 &mdash;
             </tal:count>
           </td>
+          <td tal:content="entry/potemplate/messageCount">87</td>
           <td tal:attributes="id string:${entry/potemplate/name}-time">
             <span class="sortkey"
               tal:condition="entry/date_changed"
@@ -172,7 +172,6 @@
         <tfoot>
           <tr>
             <th>Overall statistics:</th>
-            <td><span tal:replace="context/messageCount">N</span></td>
             <td>
               <span style="white-space: nowrap"
                     tal:content="structure context/@@+barchart">--</span>
@@ -180,6 +179,7 @@
             <td><span tal:replace="context/untranslatedCount">N</span></td>
             <td><span tal:replace="context/unreviewedCount">N</span></td>
             <td><span tal:replace="context/updatesCount">N</span></td>
+            <td><span tal:replace="context/messageCount">N</span></td>
             <td colspan="2"></td>
           </tr>
         </tfoot>