Merge lp:~henninge/launchpad/devel-705176-sharing-info-on-page into lp:launchpad

[Henning Eggers]

[r=adeuring][ui=sinzui][bug=705176][incr] Display sharing information on translation pages.

= Summary =

First step: display sharing information on translation pages. This
makes it easy for translators to go to the "other side" of a
translation link (i.e. a packaging link).

The next step will be to add a link to a page where more detail about
translation sharing can be found and which also allows to setup
sharing.

For the UI review, here are some screenshots of how the information appears in the UI:
http://people.canonical.com/~henninge/screenshots/sharing-information-productseries.png
http://people.canonical.com/~henninge/screenshots/sharing-information-template.png
http://people.canonical.com/~henninge/screenshots/sharing-information-pofile.png

== Proposed fix ==

Use the functions provided in translationsharinginfo to display the
correct text and link on the pages.

== Pre-implementation notes ==

I discussed this with Maris at the Thunderdome. We agreed that the "Templates with the same name elsewhere" section had to go away since that information would now be provided through the sharing information.

I chatted with Deryck about this. We weren't entirely sure, where
exactly to place the information on the pages. At least I was, so this
is still up to UI discussion.

== Implementation details ==

Pretty straight forward implementation of test, view class attributes
and templates.

I changed the get_ubuntu_sharing_info to return a list instead of a
generator. This was easier to handle and is also symmetric to
get_upstream_translation_info.

The new UI elements are hidden behind a feature flag. Actually, the elements from this branch could go live immediately but subsequent branches will need to be hidden until the feature is complete.

== Tests ==

bin/test -vvcm lp.translations.browser.test.test_sharing_information

== Demo and Q/A ==

You will have to enable the feature:
translations.sharing_information.enabled

View sharing information for a product series here:
http://translations.launchpad.dev/evolution/trunk

View sharing information for a template here:
http://translations.launchpad.dev/evolution/trunk/+pots/evolution-2.2

View sharing information for a pofile here:
http://translations.launchpad.dev/evolution/trunk/+pots/evolution-2.2/es

Once on the other side, you'll see the equivalent links there.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/services/features/flags.py
  lib/lp/translations/browser/pofile.py
  lib/lp/translations/browser/potemplate.py
  lib/lp/translations/browser/productseries.py
  lib/lp/translations/browser/sourcepackage.py
  lib/lp/translations/browser/tests/test_sharing_information.py
  lib/lp/translations/templates/pofile-translate.pt
  lib/lp/translations/templates/potemplate-index.pt
  lib/lp/translations/templates/productseries-translations.pt
  lib/lp/translations/templates/sourcepackage-translations.pt
  lib/lp/translations/utilities/translationsharinginfo.py

./lib/lp/translations/browser/pofile.py
     794: E301 expected 1 blank line, found 2
     910: E301 expected 1 blank line, found 2

[Curtis Hovey (sinzui)]

Hi Henning.

These images look good. I have questions though about consistency with other parts of Lp.

We show the package icon next to package on several pages where we tell users about Ubuntu. eg. <https://bugs.launchpad.net/evolution>. Why should <http://people.canonical.com/~henninge/screenshots/sharing-information-productseries.png> be different? Does
    [%] evolution in Ubuntu Hoary
make it easier to understand that the package is a separate thing?

The phrasing for this changes on other pages. I believe they are using an established convention. The package is in quotes and follows the distro and series names:
    Template "evolution-2.2" in Ubuntu Hoary package "evolution"
could be
    [%] evolution in Ubuntu Hoary Template "evolution-2.2"

review: Needs Information (ui)

[Henning Eggers (henninge)]

Hi Curtis!

For the source packages I used fmt:link, so I guess that formatter needs to be fixed. I now copied the code from the product home page. I will look at doing something similar for the templates and such. I like the version with icon better myself although it looks a bit crooked at the moment which is probably due to the UbuntuBeta Mono font.

I will come back with new screenshots but may have to wait until Monday.

Henning

[Abel Deuring (adeuring)]

Hi Henning,

overall, nice work. I have just a few minor suggestions, see below.
Nothing serious, so feel free to land the branch as it is.

> === modified file 'lib/lp/translations/browser/pofile.py'
> --- lib/lp/translations/browser/pofile.py 2011-01-24 15:51:18 +0000
> +++ lib/lp/translations/browser/pofile.py 2011-02-25 16:16:52 +0000
> @@ -59,6 +59,12 @@
> ITranslationImportQueue,
> )
> from lp.translations.interfaces.translationsperson import ITranslationsPerson
> +from lp.translations.utilities.translationsharinginfo import (
> + has_ubuntu_template,
> + has_upstream_template,
> + get_ubuntu_sharing_info,
> + get_upstream_sharing_info,
> + )
>
>
> class POFileNavigation(Navigation):
> @@ -986,6 +992,36 @@
> def translations_order(self):
> return ' '.join(self._messages_html_id())
>
> + @property
> + def is_upstream_pofile(self):
> + potemplate = self.context.potemplate
> + return potemplate.translation_side == TranslationSide.UPSTREAM
> +
> + def is_sharing(self):
> + if self.is_upstream_pofile:
> + return has_ubuntu_template(
> + productseries=self.context.potemplate.productseries,
> + templatename=self.context.potemplate.name)
> + else:
> + return has_upstream_template(
> + sourcepackage=self.context.potemplate.sourcepackage,
> + templatename=self.context.potemplate.name)
> +
> + @property
> + def sharing_pofile(self):
> + if self.is_upstream_pofile:
> + infos = get_ubuntu_sharing_info(
> + productseries=self.context.potemplate.productseries,
> + templatename=self.context.potemplate.name)
> + else:
> + infos = get_upstream_sharing_info(
> + sourcepackage=self.context.potemplate.sourcepackage,
> + templatename=self.context.potemplate.name)
> + if len(infos) == 0:
> + return None
> + obj, potemplate = infos[0]
> + return potemplate.getPOFileByLang(self.context.language.code)

The three properties defined above...

> +
>
> class POExportView(BaseExportView):
>
>
> === modified file 'lib/lp/translations/browser/potemplate.py'
> --- lib/lp/translations/browser/potemplate.py 2010-12-02 16:13:51 +0000
> +++ lib/lp/translations/browser/potemplate.py 2011-02-25 16:16:52 +0000
> @@ -77,12 +77,19 @@
> IPOTemplateSet,
> IPOTemplateSubset,
> )
> +from lp.translations.interfaces.side import TranslationSide
> from lp.translations.interfaces.translationimporter import (
> ITranslationImporter,
> )
> from lp.translations.interfaces.translationimportqueue import (
> ITranslationImportQueue,
> )
> +from lp.translations.utilities.translationsharinginfo import (
> + has_ubuntu_template,
> + get_ubuntu_sharing_info,
> + has_upstream_template,
> + get_upstream_sharing_info,
> + )
>
>
> class POTemplateNavigation(Navigation):
> @@ -354,6 +361,35 @@
> pofile = pofileset.getDummy(self.context, language)
> return pofile
>
> + @property
> + def is_upstream_template(self):
> ...

review: Approve (code)

[Curtis Hovey (sinzui)]

> Hi Curtis!
>
> For the source packages I used fmt:link, so I guess that formatter needs to be
> fixed. I now copied the code from the product home page. I will look at doing
> something similar for the templates and such. I like the version with icon
> better myself although it looks a bit crooked at the moment which is probably
> due to the UbuntuBeta Mono font.

I thought the Icon issue in the formatter was fixed. Maybe ISourcePackage and IDistributionSourcePackage are different. I will let you sort that out.

I know the pain of the beta fonts. I have decided to not design for them yet.

> I will come back with new screenshots but may have to wait until Monday.

I am marking the UI as approved.

review: Approve (ui)

[Henning Eggers (henninge)]

Hi Curtis!

Here are some screenshots of how it looks now:
http://people.canonical.com/~henninge/screenshots/sharing-information/

I really would have liked to avoid presenting two links in the statement. Since the sharing template always has the name as the one currently in view, that information is kind of redundant. So the text could just be "This template is sharing translations with [*]_Evolution_trunk_series_" but the link would have to be to the template, not the product series. I find it a bit misleading to use an icon for a product series and let it lead you to a template. So I did not do that. Maybe this is just missing an icon for "POTemplate"?

Having said that, I did something similar on the POFile view because the name of the template links to the sharing POFile (i.e. the specific language) but I think that's expected. Also, there is no icon.

For the link tests I had to use "displayname" for source packages and "title" for product series because "title" would only give me "trunk" for the latter. Maybe these properties need to be more conforming to conventions?

[Curtis Hovey (sinzui)]

I completely agree that we are missing icons that would make this clear. I think we should treat this as a separate issue. At least, do not block this branch from landing. We do need better conventions here. I think we can solve that separately, and update several pages.

I know how to make icons, but I do not know what they could look like. Maybe something in the style of http://design.canonical.com/brand/8.%20Pictograms.pdf
I think we want to add some formatters so that we do not need to craft these links.

[Henning Eggers (henninge)]

Hi Abel,
thank you for your review. I was able to remove some redundancy from the test and also fixed the misplaced tal:condition in the page template. Thanks for spotting that!

I have already contemplated that it might be possible to put the "sharing information" portlet in a makro or subview to reduce redundancy but like you I see too many subtle differences that might make this more complex than is good. I might give it a try in a later branch, though.

I also took William's remarks on the mailing list to heart and removed cruft right here where I created it, namely "relatives_by_name" and some related stuff. This is now gone from the template index because that information is in the sharing information. I am sure I would not have remembered to remove it later but it bloats the diff to almost 800 lines. Oh well. ;-)

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-02-24 19:59:45 +0000
+++ lib/lp/services/features/flags.py	2011-03-02 09:23:15 +0000
@@ -73,6 +73,10 @@
      'boolean',
      'Enables derivative distributions pages.',
      ''),
+    ('translations.sharing_information.enabled',
+     'boolean',
+     'Enables display of sharing information on translation pages.',
+     ''),
     ('visible_render_time',
      'boolean',
      'Shows the server-side page render time in the login widget.',

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2011-01-24 15:51:18 +0000
+++ lib/lp/translations/browser/pofile.py	2011-03-02 09:23:15 +0000
@@ -59,6 +59,12 @@
     ITranslationImportQueue,
     )
 from lp.translations.interfaces.translationsperson import ITranslationsPerson
+from lp.translations.utilities.translationsharinginfo import (
+    has_ubuntu_template,
+    has_upstream_template,
+    get_ubuntu_sharing_info,
+    get_upstream_sharing_info,
+    )
 
 
 class POFileNavigation(Navigation):
@@ -986,6 +992,40 @@
     def translations_order(self):
         return ' '.join(self._messages_html_id())
 
+    @property
+    def is_upstream_pofile(self):
+        potemplate = self.context.potemplate
+        return potemplate.translation_side == TranslationSide.UPSTREAM
+
+    def is_sharing(self):
+        if self.is_upstream_pofile:
+            return has_ubuntu_template(
+                productseries=self.context.potemplate.productseries,
+                templatename=self.context.potemplate.name)
+        else:
+            return has_upstream_template(
+                sourcepackage=self.context.potemplate.sourcepackage,
+                templatename=self.context.potemplate.name)
+
+    @property
+    def sharing_pofile(self):
+        if self.is_upstream_pofile:
+            infos = get_ubuntu_sharing_info(
+                productseries=self.context.potemplate.productseries,
+                templatename=self.context.potemplate.name)
+        else:
+            infos = get_upstream_sharing_info(
+                sourcepackage=self.context.potemplate.sourcepackage,
+                templatename=self.context.potemplate.name)
+        if len(infos) == 0:
+            return None
+        obj, potemplate = infos[0]
+        pofile = potemplate.getPOFileByLang(self.context.language.code)
+        if pofile is None:
+            pofile = potemplate.getDummyPOFile(
+                self.context.language, check_for_existing=False)
+        return pofile
+
 
 class POExportView(BaseExportView):
 

=== modified file 'lib/lp/translations/browser/potemplate.py'
--- lib/lp/translations/browser/potemplate.py	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/browser/potemplate.py	2011-03-02 09:23:15 +0000
@@ -77,12 +77,19 @@
     IPOTemplateSet,
     IPOTemplateSubset,
     )
+from lp.translations.interfaces.side import TranslationSide
 from lp.translations.interfaces.translationimporter import (
     ITranslationImporter,
     )
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue,
     )
+from lp.translations.utilities.translationsharinginfo import (
+    has_ubuntu_template,
+    get_ubuntu_sharing_info,
+    has_upstream_template,
+    get_upstream_sharing_info,
+    )
 
 
 class POTemplateNavigation(Navigation):
@@ -291,12 +298,6 @@
                 translation_group.translation_guide_url is not None)
 
     @property
-    def has_related_templates(self):
-        by_source = self.context.relatives_by_source
-        by_name = self.context.relatives_by_name
-        return bool(by_source) or bool(by_name)
-
-    @property
     def related_templates_by_source(self):
         by_source = list(
             self.context.relatives_by_source[:self.SHOW_RELATED_TEMPLATES])
@@ -328,17 +329,6 @@
             return ""
 
     @property
-    def related_templates_by_name(self):
-        by_name = list(
-            self.context.relatives_by_name[:self.SHOW_RELATED_TEMPLATES])
-        return by_name
-
-    @property
-    def has_more_templates_by_name(self):
-        by_name_count = self.context.relatives_by_name.count()
-        return by_name_count > self.SHOW_RELATED_TEMPLATES
-
-    @property
     def has_pofiles(self):
         languages = set(
             self.context.languages()).union(self.translatable_languages)
@@ -354,6 +344,35 @@
             pofile = pofileset.getDummy(self.context, language)
         return pofile
 
+    @property
+    def is_upstream_template(self):
+        return self.context.translation_side == TranslationSide.UPSTREAM
+
+    def is_sharing(self):
+        if self.is_upstream_template:
+            return has_ubuntu_template(
+                productseries=self.context.productseries,
+                templatename=self.context.name)
+        else:
+            return has_upstream_template(
+                sourcepackage=self.context.sourcepackage,
+                templatename=self.context.name)
+
+    @property
+    def sharing_template(self):
+        if self.is_upstream_template:
+            infos = get_ubuntu_sharing_info(
+                productseries=self.context.productseries,
+                templatename=self.context.name)
+        else:
+            infos = get_upstream_sharing_info(
+                sourcepackage=self.context.sourcepackage,
+                templatename=self.context.name)
+        if len(infos) == 0:
+            return None
+        obj, template = infos[0]
+        return template
+
 
 class POTemplateUploadView(LaunchpadView, TranslationsMixin):
     """Upload translations and updated template."""

=== modified file 'lib/lp/translations/browser/productseries.py'
--- lib/lp/translations/browser/productseries.py	2011-02-02 15:43:31 +0000
+++ lib/lp/translations/browser/productseries.py	2011-03-02 09:23:15 +0000
@@ -61,6 +61,10 @@
 from lp.translations.interfaces.translations import (
     TranslationsBranchImportMode,
     )
+from lp.translations.utilities.translationsharinginfo import (
+    has_ubuntu_template,
+    get_ubuntu_sharing_info,
+    )
 
 
 class ProductSeriesTranslationsMenuMixIn:
@@ -447,6 +451,17 @@
         """Whether or not the user is a translations admin."""
         return check_permission("launchpad.TranslationsAdmin", self.context)
 
+    def is_sharing(self):
+        return has_ubuntu_template(productseries=self.context)
+
+    @property
+    def sharing_sourcepackage(self):
+        infos = get_ubuntu_sharing_info(productseries=self.context)
+        if len(infos) == 0:
+            return None
+        sourcepackage, template = infos[0]
+        return sourcepackage
+
 
 class SettingsRadioWidget(LaunchpadRadioWidgetWithDescription):
     """Remove the confusing hint under the widget."""

=== modified file 'lib/lp/translations/browser/sourcepackage.py'
--- lib/lp/translations/browser/sourcepackage.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/browser/sourcepackage.py	2011-03-02 09:23:15 +0000
@@ -19,9 +19,14 @@
 from lp.registry.interfaces.sourcepackage import ISourcePackage
 from lp.translations.browser.poexportrequest import BaseExportView
 from lp.translations.browser.translations import TranslationsMixin
+from lp.translations.utilities.translationsharinginfo import (
+    has_upstream_template,
+    get_upstream_sharing_info,
+    )
 
 
 class SourcePackageTranslationsView(TranslationsMixin):
+
     @property
     def potemplates(self):
         return list(self.context.getCurrentTranslationTemplates())
@@ -30,6 +35,18 @@
     def label(self):
         return "Translations for %s" % self.context.displayname
 
+    def is_sharing(self):
+        return has_upstream_template(self.context)
+
+    @property
+    def sharing_productseries(self):
+        infos = get_upstream_sharing_info(self.context)
+        if len(infos) == 0:
+            return None
+
+        productseries, template = infos[0]
+        return productseries
+
 
 class SourcePackageTranslationsMenu(NavigationMenu):
     usedfor = ISourcePackage

=== added file 'lib/lp/translations/browser/tests/test_sharing_information.py'
--- lib/lp/translations/browser/tests/test_sharing_information.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/browser/tests/test_sharing_information.py	2011-03-02 09:23:15 +0000
@@ -0,0 +1,215 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the POTemplate recipe view classes and templates."""
+
+__metaclass__ = type
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+from canonical.launchpad.testing.pages import (
+    extract_text,
+    find_tag_by_id,
+    )
+from lp.app.enums import ServiceUsage
+from lp.services.features.testing import FeatureFixture
+from lp.testing import (
+    BrowserTestCase,
+    celebrity_logged_in,
+    )
+from lp.translations.interfaces.side import TranslationSide
+
+
+def set_translations_usage(obj):
+    """Set the translations_usage to LAUNCHPAD."""
+    with celebrity_logged_in('admin'):
+        obj.translations_usage = ServiceUsage.LAUNCHPAD
+
+
+def enable_translations_on_distroseries(distroseries):
+    with celebrity_logged_in('admin'):
+        distroseries.hide_all_translations = False
+
+
+class TestSharingInfoMixin:
+    """Test display of sharing info."""
+
+    def _makePackagingAndTemplates(self, side):
+        """Create a packaging links and the templates on each side of it.
+
+        Returns the template for the requested side.
+        """
+        upstream_template = self.factory.makePOTemplate()
+        packaging = self.factory.makePackagingLink(
+            productseries=upstream_template.productseries, in_ubuntu=True)
+        ubuntu_template = self.factory.makePOTemplate(
+            distroseries=packaging.distroseries,
+            sourcepackagename=packaging.sourcepackagename,
+            name=upstream_template.name)
+        if side == TranslationSide.UPSTREAM:
+            return upstream_template
+        else:
+            return ubuntu_template
+
+    def makeNotSharingObject(self):
+        """Create an object that is not sharing."""
+        raise NotImplementedError
+
+    NOT_SHARING_TEXT = None
+
+    def makeSharingObject(self):
+        """Create an object that is sharing."""
+        raise NotImplementedError
+
+    SHARING_TEXT = None
+
+    def _test_sharing_information(self, obj, expected_text):
+        self.useFixture(FeatureFixture(
+            {'translations.sharing_information.enabled': 'on'}))
+        browser = self.getViewBrowser(
+            obj, no_login=True, rootsite="translations")
+        sharing_info = find_tag_by_id(browser.contents, 'sharing-information')
+        if expected_text is None:
+            self.assertIs(None, sharing_info)
+        else:
+            self.assertIsNot(None, sharing_info)
+            self.assertTextMatchesExpressionIgnoreWhitespace(
+                expected_text, extract_text(sharing_info))
+
+    def test_not_sharing(self):
+        self._test_sharing_information(
+            self.makeNotSharingObject(), self.NOT_SHARING_TEXT)
+
+    def test_sharing(self):
+        self._test_sharing_information(
+            self.makeSharingObject(), self.SHARING_TEXT)
+
+
+class TestUpstreamPOTemplateSharingInfo(BrowserTestCase,
+                                        TestSharingInfoMixin):
+    """Test display of template sharing info."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        return self.factory.makePOTemplate()
+
+    NOT_SHARING_TEXT = """
+        This template is not sharing translations with a template in an
+        Ubuntu source package."""
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UPSTREAM)
+        return template
+
+    SHARING_TEXT = """
+        This template is sharing translations with .*"""
+
+
+class TestPOFileSharingInfo(BrowserTestCase, TestSharingInfoMixin):
+    """Test display of POFile sharing info."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        return self.factory.makePOFile()
+
+    NOT_SHARING_TEXT = None
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UPSTREAM)
+        # This will also create a copy of pofile in the sharing template.
+        pofile = self.factory.makePOFile(
+            potemplate=template, create_sharing=True)
+        return pofile
+
+    SHARING_TEXT = """
+        These translations are shared with .*"""
+
+
+class TestDummyPOFileSharingInfo(BrowserTestCase, TestSharingInfoMixin):
+    """Test display of DummyPOFile sharing info."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        template = self.factory.makePOTemplate()
+        return template.getDummyPOFile(self.factory.makeLanguage())
+
+    NOT_SHARING_TEXT = None
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UPSTREAM)
+        # This will also create a copy of pofile in the sharing template.
+        return template.getDummyPOFile(self.factory.makeLanguage())
+
+    SHARING_TEXT = """
+        These translations are shared with .*"""
+
+
+class TestUpstreamSharingInfo(BrowserTestCase, TestSharingInfoMixin):
+    """Test display of product series sharing info."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        productseries = self.factory.makeProductSeries()
+        set_translations_usage(productseries.product)
+        return productseries
+
+    NOT_SHARING_TEXT = """
+        This project series is not sharing translations with an Ubuntu source
+        package."""
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UPSTREAM)
+        return template.productseries
+
+    SHARING_TEXT = """
+        This project series is sharing translations with .*"""
+
+
+class TestUbuntuPOTemplateSharingInfo(BrowserTestCase, TestSharingInfoMixin):
+    """Test display of template sharing info in an Ubuntu source package."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        template = self.factory.makePOTemplate(side=TranslationSide.UBUNTU)
+        enable_translations_on_distroseries(template.distroseries)
+        return template
+
+    NOT_SHARING_TEXT = """
+        This template is not sharing translations with a template in an
+        upstream project."""
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UBUNTU)
+        enable_translations_on_distroseries(template.distroseries)
+        return template
+
+    SHARING_TEXT = """
+        This template is sharing translations with .*"""
+
+
+class TestUbuntuSharingInfo(BrowserTestCase, TestSharingInfoMixin):
+    """Test display of source package sharing info."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeNotSharingObject(self):
+        sourcepackage = self.factory.makeSourcePackage(
+            distroseries=self.factory.makeUbuntuDistroSeries())
+        enable_translations_on_distroseries(sourcepackage.distroseries)
+        return sourcepackage
+
+    NOT_SHARING_TEXT = """
+        This source package is not sharing translations with an upstream
+        project."""
+
+    def makeSharingObject(self):
+        template = self._makePackagingAndTemplates(TranslationSide.UBUNTU)
+        enable_translations_on_distroseries(template.distroseries)
+        return template.sourcepackage
+
+    SHARING_TEXT = """
+        This source package is sharing translations with .*"""

=== modified file 'lib/lp/translations/doc/potemplate.txt'
--- lib/lp/translations/doc/potemplate.txt	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/doc/potemplate.txt	2011-03-02 09:23:15 +0000
@@ -273,24 +273,6 @@
     >>> len(potmsgsets)
     0
 
-== relatives_by_name ==
-
-This property gives us an iterator of IPOTemplate objects that have the
-same name and are 'current'.
-
-This is the template we are working with:
-
-    >>> potemplate.title
-    u'Template "evolution-2.2" in Evolution trunk'
-
-And this is the list of templates related with this one based on its
-name:
-
-    >>> for relative_potemplate in potemplate.relatives_by_name:
-    ...     assert relative_potemplate.iscurrent
-    ...     print relative_potemplate.title
-    Template "evolution-2.2" in Ubuntu Hoary package "evolution"
-
 == relatives_by_source ==
 
 This property gives us an iterator of IPOTemplate objects that are in the

=== modified file 'lib/lp/translations/interfaces/potemplate.py'
--- lib/lp/translations/interfaces/potemplate.py	2011-02-14 17:14:17 +0000
+++ lib/lp/translations/interfaces/potemplate.py	2011-03-02 09:23:15 +0000
@@ -256,9 +256,6 @@
             value_type=Reference(schema=Interface)),
         exported_as='translation_files')
 
-    relatives_by_name = Attribute(
-        _('All `IPOTemplate` objects that have the same name asa this one.'))
-
     relatives_by_source = Attribute(
         _('''All `IPOTemplate` objects that have the same source.
             For example those that came from the same productseries or the

=== modified file 'lib/lp/translations/model/potemplate.py'
--- lib/lp/translations/model/potemplate.py	2011-02-24 14:57:45 +0000
+++ lib/lp/translations/model/potemplate.py	2011-03-02 09:23:15 +0000
@@ -351,13 +351,6 @@
         return self.getTranslationPolicy().getEffectiveTranslationPermission()
 
     @property
-    def relatives_by_name(self):
-        """See `IPOTemplate`."""
-        return POTemplate.select(
-            'id <> %s AND name = %s AND iscurrent' % sqlvalues(
-                self, self.name), orderBy=['datecreated'])
-
-    @property
     def relatives_by_source(self):
         """See `IPOTemplate`."""
         if self.productseries is not None:

=== modified file 'lib/lp/translations/stories/standalone/xx-potemplate-index.txt'
--- lib/lp/translations/stories/standalone/xx-potemplate-index.txt	2010-12-30 12:50:16 +0000
+++ lib/lp/translations/stories/standalone/xx-potemplate-index.txt	2011-03-02 09:23:15 +0000
@@ -63,6 +63,42 @@
     Finnish               ...          ...         ...   ...   P\xf6ll\xe4
 
 
+Sharing information
+-------------------
+
+The template is sharing translations with the template of the same name in
+the Ubuntu source package. This information is displayed on the page.
+
+    >>> from lp.services.features.testing import FeatureFixture
+    >>> feature_flag = {'translations.sharing_information.enabled': 'on'}
+    >>> with FeatureFixture(feature_flag):
+    ...     anon_browser.open('http://translations.launchpad.dev/evolution'
+    ...         '/trunk/+pots/evolution-2.2')
+    >>> sharing_info = find_tag_by_id(
+    ...     anon_browser.contents, 'sharing-information')
+    >>> print extract_text(sharing_info)
+    Sharing Information
+    This template is sharing translations with
+    evolution in Ubuntu Hoary template evolution-2.2.
+    >>> print sharing_info
+    <div...<a href="/ubuntu/hoary/+source/evolution/+pots/evolution-2.2"...
+
+Likewise, the Ubuntu template gives information about how it is sharing
+translations with the upstream project.
+
+    >>> with FeatureFixture(feature_flag):
+    ...     anon_browser.open('http://translations.launchpad.dev/ubuntu'
+    ...         '/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> sharing_info = find_tag_by_id(
+    ...     anon_browser.contents, 'sharing-information')
+    >>> print extract_text(sharing_info)
+    Sharing Information
+    This template is sharing translations with
+    Evolution trunk series template evolution-2.2.
+    >>> print sharing_info
+    <div...<a href="/evolution/trunk/+pots/evolution-2.2"...
+
+
 Finding related templates
 -------------------------
 
@@ -85,32 +121,6 @@
     </p>
 
 
-DistroSeries and ProductSeries links to related templates
----------------------------------------------------------
-
-We are presented not only with links to alternate templates from the same
-source, but also with links to the same template in (other) distroseries.
-
-    >>> anon_browser.open('http://translations.launchpad.dev/evolution'
-    ...     '/trunk/+pots/evolution-2.2')
-    >>> alternate_notice = find_tag_by_id(anon_browser.contents,
-    ...                                   'potemplate-rel-by-name')
-    >>> print extract_text(alternate_notice)
-    Templates with the same name elsewhere: Ubuntu Hoary
-    >>> print alternate_notice
-    <p...<a href="/ubuntu/hoary/+source/evolution/+pots/evolution-2.2"...
-
-The template in the other distroseries links back to this one.
-
-    >>> anon_browser.open('http://translations.launchpad.dev/ubuntu'
-    ...     '/hoary/+source/evolution/+pots/evolution-2.2')
-    >>> alternate_notice = find_tag_by_id(anon_browser.contents,
-    ...                                   'potemplate-rel-by-name')
-    >>> print extract_text(alternate_notice)
-    Templates with the same name elsewhere: Evolution trunk
-    >>> print alternate_notice
-    <p...<a href="/evolution/trunk/+pots/evolution-2.2"...
-
 When the branch or the source package contains less than five templates
 they are all displayed on the template page.
 

=== modified file 'lib/lp/translations/templates/pofile-translate.pt'
--- lib/lp/translations/templates/pofile-translate.pt	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/templates/pofile-translate.pt	2011-03-02 09:23:15 +0000
@@ -60,6 +60,31 @@
       <metal:nav-pofile-subpages
         use-macro="context/@@+translations-macros/nav-pofile-subpages" />
 
+      <!-- Sharing information -->
+      <div tal:condition="features/translations.sharing_information.enabled">
+        <div id="sharing-information"
+             tal:condition="view/is_sharing">
+          <p tal:define="sharing_pofile view/sharing_pofile;
+                         template sharing_pofile/potemplate">
+            These translations are shared with
+              <a class="sprite package-source"
+                tal:condition="view/is_upstream_pofile"
+                tal:content="template/sourcepackage/displayname"
+                tal:attributes="href template/sourcepackage/fmt:url">
+                apache in Ubuntu Hoary
+              </a><a class="sprite product"
+                tal:condition="not:view/is_upstream_pofile"
+                tal:content="template/productseries/title"
+                tal:attributes="href template/productseries/fmt:url">
+                Evolution trunk
+              </a> template
+              <a tal:attributes="href sharing_pofile/fmt:url"
+                 tal:content="template/name"
+               >evolution-2.2</a>.
+          </p>
+        </div>
+      </div>
+
         <!-- View filter and suggestions from alternative language. -->
         <form method="get" style="text-align: left;" action="+translate">
           <!-- the hidden elements -->

=== modified file 'lib/lp/translations/templates/potemplate-index.pt'
--- lib/lp/translations/templates/potemplate-index.pt	2010-10-10 21:54:16 +0000
+++ lib/lp/translations/templates/potemplate-index.pt	2011-03-02 09:23:15 +0000
@@ -35,54 +35,6 @@
   </div>
 
   <div class="yui-g">
-    <div class="yui-b portlet">
-      <h3>Related templates</h3>
-    </div>
-    <div class="yui-u first">
-      <p tal:condition="context/relatives_by_source" id="potemplate-relatives">
-        <span>Other templates here:</span>
-        <tal:relatives_by_source repeat="pot view/related_templates_by_source">
-          <a href=""
-             tal:attributes="href pot/fmt:url"
-             tal:content="pot/name">A POTemplate
-          </a><tal:comma condition="not: repeat/pot/end">, 
-        </tal:comma></tal:relatives_by_source><!--
-          --><tal:more-templates replace="structure view/more_templates_by_source_link">
-          and <a href="#">17 other templates</a>
-          </tal:more-templates>.
-      </p>
-    </div>
-
-    <div class="yui-u">
-      <p tal:condition="context/relatives_by_name"
-         id="potemplate-rel-by-name">
-        <span>Templates with the same name elsewhere:</span>
-        <tal:relatives_by_name repeat="pot view/related_templates_by_name">
-          <tal:product condition="pot/productseries">
-            <a href=""
-               tal:attributes="href pot/fmt:url"
-               tal:content="string:${pot/productseries/product/displayname}
-                            ${pot/productseries/displayname}">
-              A Product and ProductSeries
-            </a>
-          </tal:product><!--
-          --><tal:distro condition="pot/distroseries">
-            <a href=""
-               tal:attributes="href pot/fmt:url">
-              <tal:distro_name content="pot/distroseries/distribution/displayname">
-                A Distribution
-              </tal:distro_name>
-              <tal:distroseries_name content="pot/distroseries/displayname">
-                and DistroSeries</tal:distroseries_name></a><!--
-          --></tal:distro><tal:comma condition="not: repeat/pot/end">, 
-          </tal:comma></tal:relatives_by_name><!--
-          --><tal:more condition="view/has_more_templates_by_name"
-                       >...</tal:more>
-      </p>
-    </div>
-  </div>
-
-  <div class="yui-g">
     <div class="yui-u first">
       <div class="portlet">
         <h3>Permissions</h3>
@@ -99,11 +51,58 @@
               ">translation instructions</a>.
         </p>
       </div>
+      <div class="portlet" id="sharing-information"
+           tal:condition="features/translations.sharing_information.enabled">
+        <h3>Sharing Information</h3>
+        <p tal:condition="not:view/is_sharing">
+          This template is not sharing translations with
+          a template in an
+          <span tal:condition="view/is_upstream_template">
+              Ubuntu source package</span>
+          <span tal:condition="not:view/is_upstream_template">
+              upstream project</span>.
+        </p>
+        <p tal:condition="view/is_sharing"
+           tal:define="template view/sharing_template">
+          This template is sharing translations with
+            <a class="sprite package-source"
+                  tal:condition="view/is_upstream_template"
+                  tal:content="template/sourcepackage/displayname"
+                  tal:attributes="href template/sourcepackage/fmt:url">
+              apache in Ubuntu Hoary
+            </a><a class="sprite product"
+                  tal:condition="not:view/is_upstream_template"
+                  tal:content="template/productseries/title"
+                  tal:attributes="href template/productseries/fmt:url">
+              Evolution trunk
+            </a> template
+            <a tal:attributes="href template/fmt:url"
+               tal:content="template/name"
+             >evolution-2.2</a>.
+        </p>
+      </div>
     </div>
 
-    <div class="yui-u"
+    <div class="yui-u">
+      <div class="portlet"
+           tal:condition="context/relatives_by_source">
+        <h3>Related templates</h3>
+        <p id="potemplate-relatives">
+          <span>Other templates here:</span>
+          <tal:relatives_by_source repeat="pot view/related_templates_by_source">
+            <a href=""
+               tal:attributes="href pot/fmt:url"
+               tal:content="pot/name">A POTemplate
+            </a><tal:comma condition="not: repeat/pot/end">, </tal:comma
+              ></tal:relatives_by_source><tal:more-templates
+                replace="structure view/more_templates_by_source_link">
+            and <a href="#">17 other templates</a>
+            </tal:more-templates>.
+        </p>
+      </div>
+
+      <div class="portlet"
          tal:condition="context/required:launchpad.AnyPerson">
-      <div class="portlet">
         <h3>Administration</h3>
         <p>If you want to synchronize these translations manually, you
           can

=== modified file 'lib/lp/translations/templates/productseries-translations.pt'
--- lib/lp/translations/templates/productseries-translations.pt	2010-11-03 13:04:59 +0000
+++ lib/lp/translations/templates/productseries-translations.pt	2011-03-02 09:23:15 +0000
@@ -76,6 +76,21 @@
                   ">translation instructions</a> first.
             </p>
           </div>
+          <div class="portlet" id="sharing-information"
+            tal:condition="features/translations.sharing_information.enabled">
+            <h3>Sharing Information</h3>
+            <p tal:condition="not:view/is_sharing">
+              This project series is not sharing translations with
+              an Ubuntu source package.
+            </p>
+            <p tal:condition="view/is_sharing"
+               tal:define="package view/sharing_sourcepackage">
+              This project series is sharing translations with
+              <a class="sprite package-source"
+            tal:attributes="href package/fmt:url"
+            tal:content="package/displayname">apache in ubuntu hoary</a>.
+            </p>
+          </div>
         </div>
 
         <div class="yui-u">

=== modified file 'lib/lp/translations/templates/sourcepackage-translations.pt'
--- lib/lp/translations/templates/sourcepackage-translations.pt	2010-12-21 15:13:17 +0000
+++ lib/lp/translations/templates/sourcepackage-translations.pt	2011-03-02 09:23:15 +0000
@@ -24,8 +24,24 @@
                  context/distroseries/distribution/@@+portlet-translation-groups-and-permission"/>
             </p>
           </div>
+          <div class="portlet" id="sharing-information"
+               tal:condition="features/translations.sharing_information.enabled">
+            <h3>Sharing Information</h3>
+            <p tal:condition="not:view/is_sharing">
+              This source package is not sharing translations with
+              an upstream project.
+            </p>
+            <p tal:condition="view/is_sharing"
+               tal:define="productseries view/sharing_productseries">
+              This source package is sharing translations with
+              <a class="sprite product"
+              tal:attributes="href productseries/fmt:url"
+              tal:content="productseries/title">Evolution trunk</a>.
+            </p>
+          </div>
         </div>
         <div class="yui-u">
+
           <div class="portlet">
             <h3>Administration</h3>
             <p>Translation files that are waiting to be imported are shown in

=== modified file 'lib/lp/translations/utilities/translationsharinginfo.py'
--- lib/lp/translations/utilities/translationsharinginfo.py	2011-02-23 11:53:06 +0000
+++ lib/lp/translations/utilities/translationsharinginfo.py	2011-03-02 09:23:15 +0000
@@ -152,9 +152,10 @@
 
 def get_ubuntu_sharing_info(productseries, templatename=None):
     """Return a list of sharing information for the given target."""
-    for result in find_ubuntu_sharing_info(productseries, templatename):
-        distroseries, sourcepackagename, templatename = result
-        yield (SourcePackage(sourcepackagename, distroseries), templatename)
+    return [
+        (SourcePackage(packagename, series), name)
+        for series, packagename, name in find_ubuntu_sharing_info(
+            productseries, templatename)]
 
 
 def get_upstream_sharing_info(sourcepackage, templatename=None):