Merge lp:~adiroiban/launchpad/bug-121520-merged into lp:launchpad

[Adi Roiban]

Don't show merged account in the list of contributors for a PO file.

[Adi Roiban (adiroiban)]

= Bug 121520 =
On https://translations.launchpad.net/+languages/st we can see that Leonardo Gregianin appears twice, one with this current account (leogregianin) and an old merged one, (leogregianin-merged.

We should not show merged accounts as they lead to „dead” pages.

== Proposed fix ==
Add a condition in the template to skip account with merged=True

== Tests ==
lp-test -t pofile-details

== Demo and Q/A ==
As I don't know how to create a merged account, and I assume it is not that trivial (no hints in the Factory) you can test it on staging
https://translations.staging.launchpad.net/+languages/st

The current page test is check that the valid/active contributors are displayed.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/translations/templates/pofile-details.pt
  lib/lp/translations/templates/pofile-translate-contributors.pt

[Graham Binns (gmb)]

This branch needs a test before it can land.

As discussed on IRC, the way to create a merged person is to create two people and then set the `merged` property of one of them to point to the other.

review: Needs Fixing

[Adi Roiban (adiroiban)]

I added a page test for checking this behavior.

[Graham Binns (gmb)]

Hi Adi,

This looks good. My only suggestion is that you change "A new account and a merged account is created for showing this behavior." to "We'll create two new accounts to demonstrate this." since that scans a little better.

r=me with that change; let me know when you've made it and I'll push this branch through EC2 for you.

review: Approve (code)

[Adi Roiban (adiroiban)]

Hi Graham,
Thanks for the suggestion!

It should be pushed.

Cheers

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-details.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-details.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-details.txt	2009-12-15 14:14:15 +0000
@@ -1,3 +1,6 @@
+POFile Details Page
+===================
+
 Each translation file has an overview page which shows the list of
 contributors.
 
@@ -103,7 +106,9 @@
     >>> print anon_browser.title
     Browsing Spanish translation...
 
-== Invalid input ==
+
+Invalid input
+-------------
 
 Manually filtering by non-existent user warns the user of the problem.
 
@@ -121,3 +126,48 @@
     [u'No person to filter by specified.',
     u'This person has made no contributions to this file.']
 
+
+Merged accounts
+---------------
+
+On the overview page of each translation pofile, users will not see merged 
+accounts.
+
+We'll create two new accounts to demonstrate this.
+
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+
+    >>> login("[e-mail]")
+    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    >>> hoary = ubuntu.getSeries('hoary')
+    >>> translator = factory.makePerson(displayname="Poly Glot")
+    >>> merged_translator = factory.makePerson(displayname="Mere Pere")
+    >>> package = factory.makeSourcePackage(distroseries=hoary)
+    >>> template = factory.makePOTemplate(
+    ...     distroseries=hoary,
+    ...     sourcepackagename=package.sourcepackagename, name='first')
+    >>> language_code = 'es'
+    >>> pofile = factory.makePOFile(language_code, potemplate=template)
+    >>> potmsgset = factory.makePOTMsgSet(template)
+    >>> potmsgset.setSequence(template, 1)
+    >>> translation = factory.makeTranslationMessage(pofile=pofile,
+    ...     translator=merged_translator, potmsgset=potmsgset)
+    >>> potmsgset.setSequence(template, 2)
+    >>> translation = factory.makeTranslationMessage(pofile=pofile,
+    ...     translator=translator, potmsgset=potmsgset)
+    >>> merged_translator.merged = translator
+    >>> logout()
+
+    >>> browser.open(
+    ...     ("http://translations.launchpad.dev/"
+    ...     "ubuntu/hoary/+source/%s/+pots/%s/%s/+details") % (
+    ...     package.name, template.name, language_code))
+    >>> print extract_text(find_main_content(browser.contents))
+    Details for ...
+    Contributors to this translation
+    The following people have made some contribution to this specific
+    translation:
+    Poly Glot (filter)
+

=== modified file 'lib/lp/translations/templates/pofile-details.pt'
--- lib/lp/translations/templates/pofile-details.pt	2009-09-16 15:27:39 +0000
+++ lib/lp/translations/templates/pofile-details.pt	2009-12-15 14:14:15 +0000
@@ -42,10 +42,12 @@
 
         <ul tal:condition="view/contributors">
           <li tal:repeat="contributor view/contributors">
-            <a tal:replace="structure contributor/fmt:link" />
-            (<a tal:attributes="
-               href string:${context/fmt:url}/+filter?person=${contributor/name}"
-              >filter</a>)
+            <tal:not-merged condition="not: contributor/merged">
+              <a tal:replace="structure contributor/fmt:link" />
+              (<a tal:attributes="
+                 href string:${context/fmt:url}/+filter?person=${contributor/name}"
+                >filter</a>)
+            </tal:not-merged>
           </li>
         </ul>
 

=== modified file 'lib/lp/translations/templates/pofile-translate-contributors.pt'
--- lib/lp/translations/templates/pofile-translate-contributors.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/pofile-translate-contributors.pt	2009-12-15 14:14:15 +0000
@@ -9,9 +9,11 @@
   <p tal:condition="view/contributors">
     Contributors to this translation:
     <tal:contributors repeat="contributor view/contributors">
-      <tal:contributor replace="structure contributor/fmt:link" /><tal:comma
-      condition="not:repeat/contributor/end">,</tal:comma><tal:period
-      condition="repeat/contributor/end">.</tal:period>
+      <tal:not-merged condition="not: contributor/merged">
+        <tal:contributor replace="structure contributor/fmt:link" /><tal:comma
+        condition="not:repeat/contributor/end">,</tal:comma><tal:period
+        condition="repeat/contributor/end">.</tal:period>
+      </tal:not-merged>
     </tal:contributors>
   </p>
 </tal:root>