Merge lp:~ursinha/launchpad/bug422056-add-translation-focus into lp:launchpad/db-devel

[Ursula Junque]

This branch fixes bug 422056, adding the ability of choosing the translation focus to a product, as it works with distributions now.

[Ursula Junque (ursinha)]

= Summary =

This branch fixes bug 422056, adding a way to set translation focus of a product, as we can do with distributions.

I've started another branch, so there's another one that bac reviewed, and his suggestions were applied here.
Here's the old MP: https://code.edge.launchpad.net/~ursinha/launchpad/add-translation-focus/+merge/15520.

== Proposed fix ==

Adding a field with all series of a project on its +changetranslators page.

== Implementation details ==

The implementation is simple: I've added the translation_focus field in product model and interface, and changed the primary_translatable to choose translation_focus if available (and translatable).

== Tests ==

./bin/test -vvt lp.translations.*
./bin/test -vvt lp.registry.*

== Demo and Q/A ==

Preparing:
 1) Go to a project page, such as https://launchpad.dev/alsa-utils
 2) Add another series to the project

A) Choosing non-translatable series as translation focus:
 1) Go to the translations page of the project, https://translations.launchpad.dev/alsa-utils
 2) As an admin user, you'll see the Change permissions option, choose it: https://translations.launchpad.dev/alsa-utils/+changetranslators
 3) Choose the series you just added, and save it
    Result: You should notice the message in the project translations page saying "Launchpad currently recommends translating alsa-utils trunk series", which means that it chose the development focus series because the one chosen as translation focus isn't translatable.

B) Choosing translatable series as translation focus:
 1) Add information to the series you added so it becomes translatable
    Result: You should notice the message in the project translations page saying "Launchpad currently recommends translating <the series you added>", which means that it chose the translation focus now that it's a translatable series.

C) Choosing no translation focus at all:
 1) Choose no series as translation focus
    Result: You should notice that it will recommend to translate the development focus.

= 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/registry/configure.zcml
  lib/lp/registry/interfaces/product.py
  lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt
  lib/lp/registry/stories/webservice/xx-project-registry.txt
  lib/lp/translations/browser/product.py
  lib/lp/registry/model/product.py
  lib/lp/translations/stories/webservice/xx-translationfocus.txt

== Pylint notices ==

lib/lp/registry/interfaces/product.py
    34: [F0401] Unable to import 'lazr.enum' (No module named enum)
    72: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    73: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    74: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    778: [C0322, IProductSet.createProduct] Operator not preceded by a space
    freshmeatproject='freshmeat_project', wikiurl='wiki_url',
    ^
    downloadurl='download_url',
    sourceforgeproject='sourceforge_project',
    programminglang='programm...

[Edwin Grubbs (edwin-grubbs)]

Hi Ursula,

This is a nice branch. All my comments are for minor changes.

merge-conditional

-Edwin

>=== modified file 'lib/lp/translations/browser/product.py'
>--- lib/lp/translations/browser/product.py 2010-01-15 14:44:39 +0000
>+++ lib/lp/translations/browser/product.py 2010-01-20 18:38:55 +0000
>@@ -16,7 +16,8 @@
> LaunchpadView, Link, canonical_url, enabled_with_permission)
> from canonical.launchpad.webapp.authorization import check_permission
> from canonical.launchpad.webapp.menu import NavigationMenu
>-from lp.registry.interfaces.product import IProduct, IProductSeries
>+from lp.registry.interfaces.product import IProduct
>+from lp.registry.interfaces.productseries import IProductSeries
> from lp.registry.browser.product import ProductEditView
> from lp.translations.browser.translations import TranslationsMixin
>
>@@ -63,7 +64,8 @@
> class ProductChangeTranslatorsView(TranslationsMixin, ProductEditView):
> label = "Set permissions and policies"
> page_title = "Permissions and policies"
>- field_names = ["translationgroup", "translationpermission"]
>+ field_names = ["translationgroup", "translationpermission",
>+ "translation_focus"]

This does not follow the style guide for multiline lists.
https://dev.launchpad.net/PythonStyleGuide#Multiline braces

> @property
> def cancel_url(self):
>
>=== added directory 'lib/lp/translations/stories/translationfocus'
>=== added file 'lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt'
>--- lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt 1970-01-01 00:00:00 +0000
>+++ lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt 2010-01-20 18:38:55 +0000
>@@ -0,0 +1,89 @@
>+The translation focus of a product can be explicitly set to a specific series.
>+When not set, launchpad recommends the development focus to translate.
>+
>+ >>> login('<email address hidden>')
>+ >>> fooproject = factory.makeProduct(name="fooproject")
>+ >>> fooproject.official_rosetta = True
>+ >>> fooproject_trunk = fooproject.getSeries("trunk")
>+ >>> fooproject_url = canonical_url(
>+ ... fooproject, rootsite="translations")
>+ >>> logout()
>+
>+Only admin users are able to change the translation focus of a product.
>+Unprivileged users visualize the recommended series for translation,

Whitespace at end of line.
s/visualize/can see/

>+but have no access to the 'Change permissions' menu.
>+
>+ >>> admin_browser.open(fooproject_url)
>+ >>> print extract_text(
>+ ... find_tags_by_class(admin_browser.contents, 'edit sprite')[0])
>+ Change permissions
>+
>+ >>> browser.open(fooproject_url)
>+ >>> print extract_text(
>+ ... find_tags_by_class(browser.contents, 'edit sprite')[0])
>+ Traceback (most recent call last):
>+ ...
>+ IndexError: list index out of range
>+

Whitespace at end of line.

>+
>+== Setting the translation focus ==
>+
>+ >>> login('<email address hidden>')
>+ >>> from zope.security.proxy import removeSecurityProxy
>+ >>> pot_main = factory.makePOTemplate(
>+ ... productseries=fooproject_trunk, name="pot1")
>+ >>> rem...

review: Approve (code)

[Ursula Junque (ursinha)]

Hi Edwin!

> Hi Ursula,
>
> This is a nice branch. All my comments are for minor changes.

All fixed and pushed. Thanks!

>
> merge-conditional
>
> -Edwin
>
>
> >=== modified file 'lib/lp/translations/browser/product.py'
> >--- lib/lp/translations/browser/product.py 2010-01-15 14:44:39 +0000
> >+++ lib/lp/translations/browser/product.py 2010-01-20 18:38:55 +0000
> >@@ -16,7 +16,8 @@
> > LaunchpadView, Link, canonical_url, enabled_with_permission)
> > from canonical.launchpad.webapp.authorization import check_permission
> > from canonical.launchpad.webapp.menu import NavigationMenu
> >-from lp.registry.interfaces.product import IProduct, IProductSeries
> >+from lp.registry.interfaces.product import IProduct
> >+from lp.registry.interfaces.productseries import IProductSeries
> > from lp.registry.browser.product import ProductEditView
> > from lp.translations.browser.translations import TranslationsMixin
> >
> >@@ -63,7 +64,8 @@
> > class ProductChangeTranslatorsView(TranslationsMixin, ProductEditView):
> > label = "Set permissions and policies"
> > page_title = "Permissions and policies"
> >- field_names = ["translationgroup", "translationpermission"]
> >+ field_names = ["translationgroup", "translationpermission",
> >+ "translation_focus"]
>
>
> This does not follow the style guide for multiline lists.
> https://dev.launchpad.net/PythonStyleGuide#Multiline braces
>
>
> > @property
> > def cancel_url(self):
> >
> >=== added directory 'lib/lp/translations/stories/translationfocus'
> >=== added file 'lib/lp/translations/stories/translationfocus/xx-product-
> translationfocus.txt'
> >--- lib/lp/translations/stories/translationfocus/xx-product-
> translationfocus.txt 1970-01-01 00:00:00 +0000
> >+++ lib/lp/translations/stories/translationfocus/xx-product-
> translationfocus.txt 2010-01-20 18:38:55 +0000
> >@@ -0,0 +1,89 @@
> >+The translation focus of a product can be explicitly set to a specific
> series.
> >+When not set, launchpad recommends the development focus to translate.
> >+
> >+ >>> login('<email address hidden>')
> >+ >>> fooproject = factory.makeProduct(name="fooproject")
> >+ >>> fooproject.official_rosetta = True
> >+ >>> fooproject_trunk = fooproject.getSeries("trunk")
> >+ >>> fooproject_url = canonical_url(
> >+ ... fooproject, rootsite="translations")
> >+ >>> logout()
> >+
> >+Only admin users are able to change the translation focus of a product.
> >+Unprivileged users visualize the recommended series for translation,
>
>
> Whitespace at end of line.
> s/visualize/can see/
>
>
> >+but have no access to the 'Change permissions' menu.
> >+
> >+ >>> admin_browser.open(fooproject_url)
> >+ >>> print extract_text(
> >+ ... find_tags_by_class(admin_browser.contents, 'edit sprite')[0])
> >+ Change permissions
> >+
> >+ >>> browser.open(fooproject_url)
> >+ >>> print extract_text(
> >+ ... find_tags_by_class(browser.contents, 'edit sprite')[0])
> >+ Traceback (most recent call last):
> >+ ...
> >+ IndexError: list index out of range
> >+
>
>
> Whitespace at end of line.
>
>
>
> >+
> >+== Setting the transla...

=== renamed file 'cronscripts/expire-ppa-binaries.py' => 'cronscripts/expire-ppa-files.py'
--- cronscripts/expire-ppa-binaries.py	2009-10-13 14:38:07 +0000
+++ cronscripts/expire-ppa-files.py	2010-01-20 20:27:21 +0000
@@ -17,6 +17,6 @@
 
 if __name__ == '__main__':
     script = PPABinaryExpirer(
-        'expire-ppa-binaries', dbuser=config.binaryfile_expire.dbuser)
+        'expire-ppa-files', dbuser=config.binaryfile_expire.dbuser)
     script.lock_and_run()
 

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-01-18 09:36:37 +0000
+++ database/schema/security.cfg	2010-01-20 20:27:21 +0000
@@ -1621,6 +1621,9 @@
 public.person                           = SELECT
 public.libraryfilealias                 = SELECT, UPDATE
 public.securebinarypackagepublishinghistory = SELECT
+public.sourcepackagereleasefile         = SELECT
+public.sourcepackagepublishinghistory   = SELECT
+public.sourcepackagerelease             = SELECT
 
 [create-merge-proposals]
 type=user

=== modified file 'lib/lp/registry/browser/menu.py'
--- lib/lp/registry/browser/menu.py	2009-08-21 20:04:25 +0000
+++ lib/lp/registry/browser/menu.py	2010-01-20 20:27:21 +0000
@@ -60,7 +60,7 @@
         text = 'Merge people'
         return Link('/people/+adminpeoplemerge', text, icon='edit')
 
-    @enabled_with_permission('launchpad.Admin')
+    @enabled_with_permission('launchpad.Moderate')
     def admin_merge_teams(self):
         text = 'Merge teams'
         return Link('/people/+adminteammerge', text, icon='edit')

=== modified file 'lib/lp/registry/browser/peoplemerge.py'
--- lib/lp/registry/browser/peoplemerge.py	2010-01-12 00:19:20 +0000
+++ lib/lp/registry/browser/peoplemerge.py	2010-01-20 20:27:21 +0000
@@ -140,15 +140,15 @@
         from zope.security.proxy import removeSecurityProxy
         for email in self.dupe_person_emails:
             email = IMasterObject(email)
-            # XXX: Guilherme Salgado 2007-10-15: Maybe this status change
-            # should be done only when merging people but not when merging
-            # teams.
-            email.status = EmailAddressStatus.NEW
             # EmailAddress.person and EmailAddress.account are readonly
             # fields, so we need to remove the security proxy here.
             naked_email = removeSecurityProxy(email)
             naked_email.personID = self.target_person.id
             naked_email.accountID = self.target_person.accountID
+            # XXX: Guilherme Salgado 2007-10-15: Maybe this status change
+            # should be done only when merging people but not when merging
+            # teams.
+            naked_email.status = EmailAddressStatus.NEW
         flush_database_updates()
         getUtility(IPersonSet).merge(self.dupe_person, self.target_person)
         self.request.response.addInfoNotification(self.merge_message)

=== modified file 'lib/lp/registry/browser/tests/peoplemerge-views.txt'
--- lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-01-06 17:52:45 +0000
+++ lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-01-20 20:27:21 +0000
@@ -6,9 +6,17 @@
 Team Merges
 -----------
 
+Create a member of the registry team that is not a member of the admins
+team.
+
     >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+    >>> registry_experts = getUtility(ILaunchpadCelebrities).registry_experts
     >>> person_set = getUtility(IPersonSet)
-    >>> registry_expert = person_set.getByName('mark')
+    >>> registry_expert = factory.makePerson()
+    >>> login_person(registry_experts.teamowner)
+    >>> ignored = registry_experts.addMember(
+    ...     registry_expert, registry_experts.teamowner)
     >>> login_person(registry_expert)
 
 A team (name21) can be merged into another (ubuntu-team).
@@ -39,6 +47,7 @@
     >>> parent_team = factory.makeTeam()
     >>> child_team = factory.makeTeam(name='child-team')
     >>> random_team = factory.makeTeam()
+    >>> login('[e-mail]')
     >>> ignored = parent_team.addMember(
     ...     child_team, reviewer=parent_team.teamowner, force_team_add=True)
     >>> form = {'field.dupe_person': child_team.name,
@@ -112,10 +121,8 @@
 Users with launchpad.Moderate such as team admins and registry experts
 can delete teams.
 
-    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
     >>> from canonical.launchpad.webapp.authorization import check_permission
 
-    >>> registry_experts = getUtility(ILaunchpadCelebrities).registry_experts
     >>> team_owner = factory.makePerson()
     >>> team_member = factory.makePerson()
     >>> deletable_team = factory.makeTeam(owner=team_owner, name='deletable')
@@ -127,7 +134,7 @@
     >>> check_permission('launchpad.Moderate', view)
     False
 
-    >>> login_person(registry_experts.teamowner)
+    >>> login_person(registry_expert)
     >>> check_permission('launchpad.Moderate', view)
     True
 
@@ -241,3 +248,26 @@
 
     >>> print find_tag_by_id(content, 'field.actions.delete')
     None
+
+The registry experts should be able to delete a team with an
+validated email address, which will be invisible, since only
+preferred email addresses are shown for teams.
+
+    >>> from canonical.launchpad.interfaces.emailaddress import (
+    ...     IEmailAddressSet)
+    >>> login_person(registry_expert)
+    >>> admin = getUtility(ILaunchpadCelebrities).admin
+    >>> registry_expert.inTeam(admin)
+    False
+    >>> deletable_team = factory.makeTeam(email="[e-mail]")
+    >>> deletable_team.setContactAddress(None)
+    >>> for email in getUtility(IEmailAddressSet).getByPerson(deletable_team):
+    ...     print email.email, email.status.title
+    [e-mail] Validated Email Address
+    >>> form = {'field.actions.delete': 'Delete'}
+    >>> view = create_initialized_view(deletable_team, '+delete', form=form)
+    >>> view.errors
+    []
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Team deleted.

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-01-04 19:07:58 +0000
+++ lib/lp/registry/configure.zcml	2010-01-20 20:27:21 +0000
@@ -1081,7 +1081,8 @@
                             remote_product screenshotsurl
                             security_contact sourceforgeproject
                             summary title translationgroup
-                            translationpermission wikiurl"/>
+                            translationpermission translation_focus
+                            wikiurl"/>
 
         <!-- mark 2006-04-10 I put "name" in the admin group because
                         with Bazaar now in place, lots of people can have personal

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/interfaces/product.py	2010-01-20 20:27:21 +0000
@@ -586,6 +586,14 @@
             readonly=True,
             value_type=Reference(schema=IProductRelease)))
 
+    translation_focus = exported(
+        ReferenceChoice(
+            title=_("Translation Focus"), required=False,
+            vocabulary='FilteredProductSeries',
+            schema=IProductSeries,
+            description=_(
+                'The ProductSeries where translations are focused.')))
+
     translatable_packages = Attribute(
         "A list of the source packages for this product that can be "
         "translated sorted by distroseries.name and sourcepackage.name.")

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-01-10 04:29:39 +0000
+++ lib/lp/registry/model/product.py	2010-01-20 20:27:21 +0000
@@ -232,6 +232,9 @@
     translationpermission = EnumCol(
         dbName='translationpermission', notNull=True,
         schema=TranslationPermission, default=TranslationPermission.OPEN)
+    translation_focus = ForeignKey(
+        dbName='translation_focus', foreignKey='ProductSeries',
+        notNull=False, default=None)
     bugtracker = ForeignKey(
         foreignKey="BugTracker", dbName="bugtracker", notNull=False,
         default=None)
@@ -746,11 +749,14 @@
         targetseries = ubuntu.currentseries
         product_series = self.translatable_series
 
-        # First, go with development focus branch
-        if product_series and self.development_focus in product_series:
-            return self.development_focus
-        # Next, go with the latest product series that has templates:
         if product_series:
+            # First, go with translation focus
+            if self.translation_focus in product_series:
+                return self.translation_focus
+            # Next, go with development focus
+            if self.development_focus in product_series:
+                return self.development_focus
+            # Next, go with the latest product series that has templates:
             return product_series[-1]
         # Otherwise, look for an Ubuntu package in the current distroseries:
         for package in packages:

=== modified file 'lib/lp/registry/stories/team/xx-adminteammerge.txt'
--- lib/lp/registry/stories/team/xx-adminteammerge.txt	2009-11-22 15:43:16 +0000
+++ lib/lp/registry/stories/team/xx-adminteammerge.txt	2010-01-20 20:27:21 +0000
@@ -4,30 +4,39 @@
 active members, so the user will first have to confirm that the
 members should be deactivated before the teams are merged.
 
-    >>> admin_browser.open('http://launchpad.dev/people/+adminteammerge')
-    >>> admin_browser.getControl('Duplicated Team').value = (
-    ...     'landscape-developers')
-    >>> admin_browser.getControl('Target Team').value = 'guadamen'
-    >>> admin_browser.getControl('Merge').click()
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> registry_expert = factory.makePerson(
+    ...     email='[e-mail]', password='test')
+    >>> new_team = factory.makeTeam(
+    ...     name="new-team", email="[e-mail]")
+    >>> registry_experts = getUtility(IPersonSet).getByName('registry')
+    >>> ignored = registry_experts.addMember(
+    ...     registry_expert, registry_experts.teamowner)
+    >>> logout()
+    >>> registry_browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> registry_browser.open('http://launchpad.dev/people/+adminteammerge')
+    >>> registry_browser.getControl('Duplicated Team').value = (
+    ...     'new-team')
+    >>> registry_browser.getControl('Target Team').value = 'guadamen'
+    >>> registry_browser.getControl('Merge').click()
 
-    >>> admin_browser.url
+    >>> registry_browser.url
     'http://launchpad.dev/people/+adminteammerge'
-    >>> print get_feedback_messages(admin_browser.contents)[0]
-    Landscape Developers has 2 active members which will have to be
-    deactivated before the teams can be merged.
+    >>> print get_feedback_messages(registry_browser.contents)[0]
+    New Team has 1 active members which will have to be deactivated
+    before the teams can be merged.
 
-    >>> admin_browser.getControl('Deactivate Members and Merge').click()
-    >>> admin_browser.url
+    >>> registry_browser.getControl('Deactivate Members and Merge').click()
+    >>> registry_browser.url
     'http://launchpad.dev/~guadamen'
 
     >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
-    >>> from canonical.launchpad.interfaces import IMailingListSet, IPersonSet
+    >>> from canonical.launchpad.interfaces import IMailingListSet
     >>> from zope.component import getUtility
     >>> login(ANONYMOUS)
-    >>> person_set = getUtility(IPersonSet)
-    >>> landscape = person_set.getByName(
-    ...     'landscape-developers-merged', ignore_merged=False)
-    >>> landscape.merged.name
+    >>> new_team.merged.name
     u'guadamen'
     >>> logout()
 
@@ -36,7 +45,7 @@
 
 Merged teams are not visible anymore.
 
-    >>> browser.open("http://launchpad.dev/~landscape-developers-merged")
+    >>> browser.open("http://launchpad.dev/~new-team-merged")
     Traceback (most recent call last):
     ...
     NotFound:...
@@ -48,45 +57,45 @@
 merged, though.
 
     >>> login(ANONYMOUS)
-    >>> guadamen = person_set.getByName('guadamen')
+    >>> guadamen = getUtility(IPersonSet).getByName('guadamen')
     >>> mailing_list = getUtility(IMailingListSet).new(guadamen)
     >>> logout()
 
-    >>> admin_browser.open('http://launchpad.dev/people/+adminteammerge')
-    >>> admin_browser.getControl('Duplicated Team').value = 'guadamen'
-    >>> admin_browser.getControl('Target Team').value = 'ubuntu-team'
-    >>> admin_browser.getControl('Merge').click()
+    >>> registry_browser.open('http://launchpad.dev/people/+adminteammerge')
+    >>> registry_browser.getControl('Duplicated Team').value = 'guadamen'
+    >>> registry_browser.getControl('Target Team').value = 'ubuntu-team'
+    >>> registry_browser.getControl('Merge').click()
 
-    >>> admin_browser.url
+    >>> registry_browser.url
     'http://launchpad.dev/people/+adminteammerge'
 
-    >>> print get_feedback_messages(admin_browser.contents)
+    >>> print get_feedback_messages(registry_browser.contents)
     [u'There is 1 error.',
      u"guadamen is associated with a Launchpad mailing list;
        we can't merge it."]
 
 We also can't (for obvious reasons) merge any person/team into itself.
 
-    >>> admin_browser.getControl('Duplicated Team').value = 'shipit-admins'
-    >>> admin_browser.getControl('Target Team').value = 'shipit-admins'
-    >>> admin_browser.getControl('Merge').click()
+    >>> registry_browser.getControl('Duplicated Team').value = 'shipit-admins'
+    >>> registry_browser.getControl('Target Team').value = 'shipit-admins'
+    >>> registry_browser.getControl('Merge').click()
 
-    >>> admin_browser.url
+    >>> registry_browser.url
     'http://launchpad.dev/people/+adminteammerge'
 
-    >>> print get_feedback_messages(admin_browser.contents)
+    >>> print get_feedback_messages(registry_browser.contents)
     [u'There is 1 error.', u"You can't merge shipit-admins into itself."]
 
 Nor can we merge a person into a team or a team into a person.
 
-    >>> admin_browser.getControl('Duplicated Team').value = 'ubuntu-team'
-    >>> admin_browser.getControl('Target Team').value = 'salgado'
-    >>> admin_browser.getControl('Merge').click()
+    >>> registry_browser.getControl('Duplicated Team').value = 'ubuntu-team'
+    >>> registry_browser.getControl('Target Team').value = 'salgado'
+    >>> registry_browser.getControl('Merge').click()
 
-    >>> admin_browser.url
+    >>> registry_browser.url
     'http://launchpad.dev/people/+adminteammerge'
 
     # Yes, the error message is not of much help, but this UI is only for
     # admins and they're supposed to know what they're doing.
-    >>> print get_feedback_messages(admin_browser.contents)
+    >>> print get_feedback_messages(registry_browser.contents)
     [u'There is 1 error.', u'Constraint not satisfied']

=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/lp/registry/stories/webservice/xx-project-registry.txt	2009-11-10 01:00:23 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt	2010-01-20 20:27:21 +0000
@@ -167,6 +167,7 @@
     sourceforge_project: None
     summary: u'The Mozilla Firefox web browser'
     title: u'Mozilla Firefox'
+    translation_focus_link: None
     wiki_url: None
 
 In Launchpad project names may not have uppercase letters in their
@@ -225,6 +226,7 @@
     sourceforge_project: None
     summary: u'The Mozilla Firefox web browser'
     title: u'Mozilla Firefox'
+    translation_focus_link: None
     wiki_url: None
 
 The milestones can be accessed through the

=== modified file 'lib/lp/soyuz/scripts/expire_ppa_binaries.py'
--- lib/lp/soyuz/scripts/expire_ppa_binaries.py	2009-12-11 14:35:28 +0000
+++ lib/lp/soyuz/scripts/expire_ppa_binaries.py	2010-01-20 20:27:21 +0000
@@ -54,7 +54,61 @@
             help=("The number of days after which to expire binaries. "
                   "Must be specified."))
 
-    def determineExpirables(self, num_days):
+    def determineSourceExpirables(self, num_days):
+        """Return expirable libraryfilealias IDs."""
+        # Avoid circular imports.
+        from lp.soyuz.interfaces.archive import ArchivePurpose
+
+        stay_of_execution = '%d days' % num_days
+
+        # The subquery here has to repeat the checks for privacy and
+        # blacklisting on *other* publications that are also done in
+        # the main loop for the archive being considered.
+        results = self.store.execute("""
+            SELECT lfa.id
+            FROM
+                LibraryFileAlias AS lfa,
+                Archive,
+                SourcePackageReleaseFile AS sprf,
+                SourcePackageRelease AS spr,
+                SourcePackagePublishingHistory AS spph
+            WHERE
+                lfa.id = sprf.libraryfile
+                AND spr.id = sprf.sourcepackagerelease
+                AND spph.sourcepackagerelease = spr.id
+                AND spph.dateremoved < (
+                    CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - interval %s)
+                AND spph.archive = archive.id
+                AND archive.purpose = %s
+                AND lfa.expires IS NULL
+            EXCEPT
+            SELECT sprf.libraryfile
+            FROM
+                SourcePackageRelease AS spr,
+                SourcePackageReleaseFile AS sprf,
+                SourcePackagePublishingHistory AS spph,
+                Archive AS a,
+                Person AS p
+            WHERE
+                spr.id = sprf.sourcepackagerelease
+                AND spph.sourcepackagerelease = spr.id
+                AND spph.archive = a.id
+                AND p.id = a.owner
+                AND (
+                    p.name IN %s
+                    OR a.private IS TRUE
+                    OR a.purpose != %s
+                    OR dateremoved >
+                        CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - interval %s
+                    OR dateremoved IS NULL);
+            """ % sqlvalues(
+                stay_of_execution, ArchivePurpose.PPA, self.blacklist,
+                ArchivePurpose.PPA, stay_of_execution))
+
+        lfa_ids = results.get_all()
+        return lfa_ids
+
+    def determineBinaryExpirables(self, num_days):
         """Return expirable libraryfilealias IDs."""
         # Avoid circular imports.
         from lp.soyuz.interfaces.archive import ArchivePurpose
@@ -116,7 +170,8 @@
         self.store = getUtility(IStoreSelector).get(
             MAIN_STORE, DEFAULT_FLAVOR)
 
-        lfa_ids = self.determineExpirables(num_days)
+        lfa_ids = self.determineSourceExpirables(num_days)
+        lfa_ids.extend(self.determineBinaryExpirables(num_days))
         batch_count = 0
         batch_limit = 500
         for id in lfa_ids:

=== modified file 'lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py'
--- lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py	2009-12-11 14:35:28 +0000
+++ lib/lp/soyuz/scripts/tests/test_expire_ppa_bins.py	2010-01-20 20:27:21 +0000
@@ -74,54 +74,76 @@
         self.layer.switchDbUser(self.dbuser)
         script.main()
 
-    def assertExpired(self, publication):
-        self.assertNotEqual(
-            publication.binarypackagerelease.files[0].libraryfile.expires,
-            None,
-            "lfa.expires should be set, but it's not.")
-
-    def assertNotExpired(self, publication):
-        self.assertEqual(
-            publication.binarypackagerelease.files[0].libraryfile.expires,
+    def assertBinaryExpired(self, publication):
+        self.assertNotEqual(
+            publication.binarypackagerelease.files[0].libraryfile.expires,
+            None,
+            "lfa.expires should be set, but it's not.")
+
+    def assertBinaryNotExpired(self, publication):
+        self.assertEqual(
+            publication.binarypackagerelease.files[0].libraryfile.expires,
+            None,
+            "lfa.expires should be None, but it's not.")
+
+    def assertSourceExpired(self, publication):
+        self.assertNotEqual(
+            publication.sourcepackagerelease.files[0].libraryfile.expires,
+            None,
+            "lfa.expires should be set, but it's not.")
+
+    def assertSourceNotExpired(self, publication):
+        self.assertEqual(
+            publication.sourcepackagerelease.files[0].libraryfile.expires,
             None,
             "lfa.expires should be None, but it's not.")
 
     def testNoExpirationWithNoDateremoved(self):
         """Test that no expiring happens if no dateremoved set."""
         pkg1 = self.stp.getPubSource(
-            sourcename="pkg1", architecturehintlist="i386", archive=self.ppa)
+            sourcename="pkg1", architecturehintlist="i386", archive=self.ppa,
+            dateremoved=None)
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg1, dateremoved=None, archive=self.ppa)
 
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(pkg1)
+        self.assertBinaryNotExpired(pub)
 
     def testNoExpirationWithDateUnderThreshold(self):
         """Test no expiring if dateremoved too recent."""
         pkg2 = self.stp.getPubSource(
-            sourcename="pkg2", architecturehintlist="i386", archive=self.ppa)
+            sourcename="pkg2", architecturehintlist="i386", archive=self.ppa,
+            dateremoved=self.under_threshold_date)
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg2, dateremoved=self.under_threshold_date,
             archive=self.ppa)
 
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(pkg2)
+        self.assertBinaryNotExpired(pub)
 
     def testExpirationWithDateOverThreshold(self):
         """Test expiring works if dateremoved old enough."""
         pkg3 = self.stp.getPubSource(
-            sourcename="pkg3", architecturehintlist="i386", archive=self.ppa)
+            sourcename="pkg3", architecturehintlist="i386", archive=self.ppa,
+            dateremoved=self.over_threshold_date)
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg3, dateremoved=self.over_threshold_date,
             archive=self.ppa)
 
         self.runScript()
-        self.assertExpired(pub)
+        self.assertSourceExpired(pkg3)
+        self.assertBinaryExpired(pub)
 
     def testNoExpirationWithDateOverThresholdAndOtherValidPublication(self):
         """Test no expiry if dateremoved old enough but other publication."""
         pkg4 = self.stp.getPubSource(
-            sourcename="pkg4", architecturehintlist="i386", archive=self.ppa)
+            sourcename="pkg4", architecturehintlist="i386", archive=self.ppa,
+            dateremoved=self.over_threshold_date)
+        other_source = pkg4.copyTo(
+            pkg4.distroseries, pkg4.pocket, self.ppa2)
+        other_source.secure_record.dateremoved = None
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg4, dateremoved=self.over_threshold_date,
             archive=self.ppa)
@@ -130,16 +152,21 @@
         other_binary.secure_record.dateremoved = None
 
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(pkg4)
+        self.assertBinaryNotExpired(pub)
 
     def testNoExpirationWithDateOverThresholdAndOtherPubUnderThreshold(self):
         """Test no expiring.
-        
+
         Test no expiring if dateremoved old enough but other publication
         not over date threshold.
         """
         pkg5 = self.stp.getPubSource(
-            sourcename="pkg5", architecturehintlist="i386", archive=self.ppa)
+            sourcename="pkg5", architecturehintlist="i386", archive=self.ppa,
+            dateremoved=self.over_threshold_date)
+        other_source = pkg5.copyTo(
+            pkg5.distroseries, pkg5.pocket, self.ppa2)
+        other_source.secure_record.dateremoved = self.under_threshold_date
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg5, dateremoved=self.over_threshold_date,
             archive=self.ppa)
@@ -148,67 +175,77 @@
         other_binary.secure_record.dateremoved = self.under_threshold_date
 
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(pkg5)
+        self.assertBinaryNotExpired(pub)
 
     def _setUpExpirablePublications(self, archive=None):
         """Helper to set up two publications that are both expirable."""
         if archive is None:
             archive = self.ppa
         pkg5 = self.stp.getPubSource(
-            sourcename="pkg5", architecturehintlist="i386", archive=archive)
+            sourcename="pkg5", architecturehintlist="i386", archive=archive,
+            dateremoved=self.over_threshold_date)
+        other_source = pkg5.copyTo(
+            pkg5.distroseries, pkg5.pocket, self.ppa2)
+        other_source.secure_record.dateremoved = self.over_threshold_date
         [pub] = self.stp.getPubBinaries(
             pub_source=pkg5, dateremoved=self.over_threshold_date,
             archive=archive)
         [other_binary] = pub.copyTo(
             pub.distroarchseries.distroseries, pub.pocket, self.ppa2)
         other_binary.secure_record.dateremoved = self.over_threshold_date
-        return pub
+        return pkg5, pub
 
     def testNoExpirationWithDateOverThresholdAndOtherPubOverThreshold(self):
         """Test expiring works.
-        
+
         Test expiring works if dateremoved old enough and other publication
         is over date threshold.
         """
-        pub = self._setUpExpirablePublications()
+        source, binary = self._setUpExpirablePublications()
         self.runScript()
-        self.assertExpired(pub)
+        self.assertSourceExpired(source)
+        self.assertBinaryExpired(binary)
 
     def testBlacklistingWorks(self):
         """Test that blacklisted PPAs are not expired."""
-        pub = self._setUpExpirablePublications()
+        source, binary = self._setUpExpirablePublications()
         script = self.getScript()
         script.blacklist = ["cprov",]
         self.layer.txn.commit()
         self.layer.switchDbUser(self.dbuser)
         script.main()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(source)
+        self.assertBinaryNotExpired(binary)
 
     def testPrivatePPAsNotExpired(self):
         """Test that private PPAs are not expired."""
         self.ppa.private = True
         self.ppa.buildd_secret = "foo"
-        pub = self._setUpExpirablePublications()
+        source, binary = self._setUpExpirablePublications()
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(source)
+        self.assertBinaryNotExpired(binary)
 
     def testDryRun(self):
         """Test that when dryrun is specified, nothing is expired."""
-        pub = self._setUpExpirablePublications()
+        source, binary = self._setUpExpirablePublications()
         # We have to commit here otherwise when the script aborts it
         # will remove the test publications we just created.
         self.layer.txn.commit()
         script = self.getScript(['--dry-run'])
         self.layer.switchDbUser(self.dbuser)
         script.main()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(source)
+        self.assertBinaryNotExpired(binary)
 
     def testDoesNotAffectNonPPA(self):
         """Test that expiry does not happen for non-PPA publications."""
         ubuntu_archive = getUtility(IDistributionSet)['ubuntu'].main_archive
-        pub = self._setUpExpirablePublications(ubuntu_archive)
+        source, binary = self._setUpExpirablePublications(ubuntu_archive)
         self.runScript()
-        self.assertNotExpired(pub)
+        self.assertSourceNotExpired(source)
+        self.assertBinaryNotExpired(binary)
 
 
 def test_suite():

=== modified file 'lib/lp/translations/browser/product.py'
--- lib/lp/translations/browser/product.py	2010-01-15 14:44:39 +0000
+++ lib/lp/translations/browser/product.py	2010-01-20 20:27:21 +0000
@@ -16,7 +16,8 @@
     LaunchpadView, Link, canonical_url, enabled_with_permission)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.menu import NavigationMenu
-from lp.registry.interfaces.product import IProduct, IProductSeries
+from lp.registry.interfaces.product import IProduct
+from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.browser.product import ProductEditView
 from lp.translations.browser.translations import TranslationsMixin
 
@@ -63,7 +64,11 @@
 class ProductChangeTranslatorsView(TranslationsMixin, ProductEditView):
     label = "Set permissions and policies"
     page_title = "Permissions and policies"
-    field_names = ["translationgroup", "translationpermission"]
+    field_names = [
+            "translationgroup",
+            "translationpermission",
+            "translation_focus"
+            ]
 
     @property
     def cancel_url(self):

=== added directory 'lib/lp/translations/stories/translationfocus'
=== added file 'lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt'
--- lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	2010-01-20 20:27:21 +0000
@@ -0,0 +1,87 @@
+The translation focus of a product can be explicitly set to a specific series.
+When not set, launchpad recommends the development focus to translate.
+
+    >>> login('[e-mail]')
+    >>> fooproject = factory.makeProduct(name="fooproject")
+    >>> fooproject.official_rosetta = True
+    >>> fooproject_trunk = fooproject.getSeries("trunk")
+    >>> fooproject_url = canonical_url(
+    ...     fooproject, rootsite="translations")
+    >>> logout()
+
+Only admin users are able to change the translation focus of a product.
+Unprivileged users can see the recommended series for translation,
+but have no access to the 'Change permissions' menu.
+
+    >>> admin_browser.open(fooproject_url)
+    >>> print extract_text(
+    ...     find_tags_by_class(admin_browser.contents, 'edit sprite')[0])
+    Change permissions
+
+    >>> browser.open(fooproject_url)
+    >>> print extract_text(
+    ...     find_tags_by_class(browser.contents, 'edit sprite')[0])
+    Traceback (most recent call last):
+    ...
+    IndexError: list index out of range
+
+== Setting the translation focus ==
+
+    >>> login('[e-mail]')
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> pot_main = factory.makePOTemplate(
+    ...     productseries=fooproject_trunk, name="pot1")
+    >>> removeSecurityProxy(pot_main).messagecount = 10
+    >>> pofile = factory.makePOFile("pt_BR", potemplate=pot_main)
+    >>> logout()
+
+When the translation focus is not set, Launchpad suggests the 
+development focus as the current series to be translated.
+It needs to be translatable.
+
+    >>> print fooproject.translation_focus
+    None
+
+    >>> browser.open(fooproject_url)
+    >>> print extract_text(find_tags_by_class(browser.contents, 'portlet')[0])
+    Translation details...
+    Launchpad currently recommends translating... Fooproject trunk series.
+    ...
+
+We can set an untranslatable series as the translation focus, but Launchpad
+won't consider it because there'll be nothing to translate.
+
+    >>> login('[e-mail]')
+    >>> fooproject_untranslatableseries = factory.makeProductSeries(
+    ...     product=fooproject,
+    ...     name="untranslatable-series")
+    >>> fooproject.translation_focus = fooproject_untranslatableseries
+    >>> logout()
+
+    >>> print removeSecurityProxy(fooproject.translation_focus.name)
+    untranslatable-series
+
+    >>> browser.open(fooproject_url)
+    >>> print extract_text(find_tags_by_class(browser.contents, 'portlet')[0])
+    Translation details...
+    Launchpad currently recommends translating... Fooproject trunk series.
+    ...
+
+We need to create a translatable series so we can set it as translation focus.
+
+    >>> login('[e-mail]')
+    >>> fooproject_otherseries = factory.makeProductSeries(product=fooproject,
+    ...     name="other-series")
+    >>> pot_other = factory.makePOTemplate(
+    ...     productseries=fooproject_otherseries, name="pot2")
+    >>> removeSecurityProxy(pot_other).messagecount = 10
+    >>> pofile1 = factory.makePOFile('pt_BR', potemplate=pot_other)
+
+    >>> fooproject.translation_focus = fooproject_otherseries
+    >>> logout()
+
+    >>> browser.open(fooproject_url)
+    >>> print extract_text(find_tags_by_class(browser.contents, 'portlet')[0])
+    Translation details...
+    Launchpad currently recommends translating... Fooproject other-series series.
+    ...

=== added file 'lib/lp/translations/stories/webservice/xx-translationfocus.txt'
--- lib/lp/translations/stories/webservice/xx-translationfocus.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/stories/webservice/xx-translationfocus.txt	2010-01-20 20:27:21 +0000
@@ -0,0 +1,34 @@
+= Translation focus =
+
+The translation focus of a project is the series chosen as the preferred
+one to be translated. It's optional. When not set, Launchpad suggests
+the development focus as the preferred series to translate, which is
+outside the scope of this test.
+
+    >>> evolution = webservice.get('/evolution').jsonBody()
+    >>> print evolution['development_focus_link']
+    http://.../evolution/trunk
+    >>> print evolution['translation_focus_link']
+    None
+
+It's possible to set the translation focus through the API
+if you're an admin. The translation focus should be a project series.
+
+    >>> from simplejson import dumps
+    >>> print webservice.patch(
+    ...     evolution['self_link'], 'application/json',
+    ...     dumps({'translation_focus_link' :
+    ...         evolution['development_focus_link']}))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> print webservice.get('/evolution').jsonBody()['translation_focus_link']
+    http://.../evolution/trunk
+
+Unprivileged users cannot set the translation focus.
+
+    >>> print user_webservice.patch(
+    ...     evolution['self_link'], 'application/json',
+    ...     dumps({'translation_focus_link': None}))
+    HTTP... 401 Unauthorized
+    ...