Merge lp:~jcsackett/launchpad/deprecate-official_rosetta into lp:launchpad

[j.c.sackett]

Replaces use of official_rosetta with translations_usage where possible, so the richer data provided by the enum can be used to drive decisions.

= Summary =

Replaces, where possible, usage of official_rosetta with the translations_usage property.

== Proposed fix ==

Where code uses official_rosetta, use translations_usage instead so that we can take advantage of richer data.

== Pre-implementation notes ==

Spoke with Curtis Hovey (sinzui) and Brad Crittenden (bac).

== Implementation details ==

As in Proposed fix.

SQL queries using official_rosetta have been left alone until data migration occurs.

== Tests ==

No new tests written.

To fully test the refactor:

bin/test -m lib.lp.registry
bin/test -m lib.lp.translations

== Demo and Q/A ==

In Launchpad.dev, nothing should crash when reviewing translations or performing translation related actions.

= Launchpad lint =

This touched enough old files that the lint output is huge. I will fix all valid lint errors before committing, but I didn't want to pollute the diff too much nor make this MP a wall of text.

[Leonard Richardson (leonardr)]

Needs bugs for the two problems marked with XXXes (lines 422 et al, and line 453). Other than that, it looks good.

review: Approve

=== modified file 'lib/lp/app/enums.py'
--- lib/lp/app/enums.py	2010-08-20 20:31:18 +0000
+++ lib/lp/app/enums.py	2010-09-09 15:34:46 +0000
@@ -1,11 +1,12 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Enumerations used in the lp/app modules."""
+"""Enumerations and related utilities used in the lp/app modules."""
 
 __metaclass__ = type
 __all__ = [
     'ServiceUsage',
+    'service_uses_launchpad',
     ]
 
 from lazr.enum import (
@@ -45,3 +46,7 @@
 
     The pillar does not use this type of service in Launchpad or externally.
     """)
+
+
+def service_uses_launchpad(usage_enum):
+    return usage_enum == ServiceUsage.LAUNCHPAD

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2010-09-03 03:12:39 +0000
+++ lib/lp/registry/browser/distribution.py	2010-09-09 15:34:46 +0000
@@ -74,6 +74,7 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.widgets.image import ImageChangeWidget
+from lp.app.enums import service_uses_launchpad
 from lp.answers.browser.faqtarget import FAQTargetNavigationMixin
 from lp.answers.browser.questiontarget import (
     QuestionTargetFacetMixin,
@@ -135,7 +136,7 @@
             if self.context.codehosting_usage == ServiceUsage.LAUNCHPAD:
                 url = canonical_url(self.context, rootsite='code')
                 uses.append(href_template % (url, 'Branches'))
-        if self.context.official_rosetta:
+        if service_uses_launchpad(self.context.translations_usage):
             url = canonical_url(self.context, rootsite='translations')
             uses.append(href_template % (url, 'Translations'))
 

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2010-09-03 03:12:39 +0000
+++ lib/lp/registry/browser/pillar.py	2010-09-09 15:34:46 +0000
@@ -30,7 +30,10 @@
     nearest,
     )
 from canonical.launchpad.webapp.tales import MenuAPI
-from lp.app.enums import ServiceUsage
+from lp.app.enums import (
+    ServiceUsage,
+    service_uses_launchpad,
+    )
 from lp.app.interfaces.launchpad import IServiceUsage
 from lp.registry.browser.structuralsubscription import (
     StructuralSubscriptionMenuMixin,
@@ -72,7 +75,7 @@
     def help_translate(self):
         return Link(
             '', 'Help translate', site='translations', icon='translations',
-            enabled=self.pillar.official_rosetta)
+            enabled=service_uses_launchpad(self.pillar.translations_usage))
 
     def submit_code(self):
         if self.pillar.codehosting_usage in [
@@ -104,7 +107,7 @@
         self.official_malone = False
         self.official_answers = False
         self.official_blueprints = False
-        self.official_rosetta = False
+        self.translations_usage = ServiceUsage.UNKNOWN
         self.codehosting_usage = ServiceUsage.UNKNOWN
         pillar = nearest(self.context, IPillar)
         if IProjectGroup.providedBy(pillar):
@@ -121,7 +124,7 @@
                 self.codehosting_usage = distribution.codehosting_usage
             elif IDistributionSourcePackage.providedBy(self.context):
                 self.official_blueprints = False
-                self.official_rosetta = False
+                self.translations_usage = ServiceUsage.UNKNOWN
             else:
                 # The context is used by all apps.
                 pass
@@ -136,8 +139,7 @@
             self.official_answers = True
         if pillar.official_blueprints:
             self.official_blueprints = True
-        if pillar.official_rosetta:
-            self.official_rosetta = True
+        self.translations_usage = IServiceUsage(pillar).translations_usage
         self.codehosting_usage = IServiceUsage(pillar).codehosting_usage
 
     @property
@@ -145,8 +147,9 @@
         """This `IPillar` uses Launchpad."""
         return (
             self.official_malone or self.official_answers
-            or self.official_blueprints or self.official_rosetta
-            or self.codehosting_usage == ServiceUsage.LAUNCHPAD)
+            or self.official_blueprints
+            or service_uses_launchpad(self.translations_usage)
+            or service_uses_launchpad(self.codehosting_usage))
 
     @property
     def enabled_links(self):

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-08-27 17:45:57 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-09-09 15:34:46 +0000
@@ -35,8 +35,8 @@
     True
     >>> view.official_answers
     True
-    >>> view.official_rosetta
-    False
+    >>> view.translations_usage.name
+    'UNKNOWN'
     >>> view.official_blueprints
     False
     >>> view.codehosting_usage.name
@@ -230,9 +230,10 @@
 set the links.  Despite the fact that the distribution uses blueprints,
 and translations those links are not enabled for DistributionSourcePackages.
 
+    >>> from lp.app.enums import ServiceUsage
     >>> login_person(distribution.owner)
     >>> distribution.official_blueprints = True
-    >>> distribution.official_rosetta = True
+    >>> distribution.translations_usage = ServiceUsage.LAUNCHPAD
     >>> package = factory.makeDistributionSourcePackage(
     ...     sourcepackagename="box",
     ...     distribution=distribution)

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-09-03 06:06:40 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-09-09 15:34:46 +0000
@@ -23,11 +23,12 @@
 The ProductSeries involvement view uses the ProductSeriesInvolvedMenu when
 rendering links:
 
+    >>> from lp.app.enums import ServiceUsage
     >>> login_person(product.owner)
     >>> product.official_answers = True
     >>> product.official_blueprints = True
     >>> product.official_malone = True
-    >>> product.official_rosetta = True
+    >>> product.translations_usage = ServiceUsage.LAUNCHPAD
     >>> view = create_view(series, '+get-involved')
 
     # official_answers is always false for product series.
@@ -37,10 +38,11 @@
     True
     >>> print view.official_malone
     True
-    >>> print view.official_rosetta
-    True
+    >>> print view.translations_usage.name
+    LAUNCHPAD
     >>> print view.codehosting_usage.name
     UNKNOWN
+
     >>> for link in view.enabled_links:
     ...     print link.url
     http://bugs.launchpad.dev/app/simple/+filebug
@@ -476,7 +478,7 @@
 A series cannot be deleted if it is has translation templates.
 
     >>> translated_series = factory.makeProductSeries(product=product)
-    >>> product.official_rosetta = True
+    >>> product.translations_usage = ServiceUsage.LAUNCHPAD
     >>> po_template = factory.makePOTemplate(
     ...     name='gibberish', productseries=translated_series)
     >>> translated_view = create_initialized_view(

=== modified file 'lib/lp/registry/doc/distribution.txt'
--- lib/lp/registry/doc/distribution.txt	2010-08-23 00:51:30 +0000
+++ lib/lp/registry/doc/distribution.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= Distributions =
+Distributions
+=============
 
 From the DerivationOverview spec
 <https://launchpad.canonical.com/DerivationOverview>:
@@ -143,7 +144,8 @@
     False
 
 
-== Distribution Sorting ==
+Distribution Sorting
+--------------------
 
 If you ask for all the distributions in the DistributionSet you should get
 Ubuntu (and all flavours of it) first and the rest alphabetically:
@@ -164,7 +166,8 @@
     True
 
 
-=== Searching for DistributionSourcePackages ===
+Searching for DistributionSourcePackages
+........................................
 
 The distribution also allows you to look for source packages that match
 a certain string through the magic of fti. For instance:
@@ -232,7 +235,8 @@
     DistributionSourcePackage: alsa-utils
 
 
-=== Searching for binary packages ===
+Searching for binary packages
+.............................
 
 There are two useful functions for searching binary packages related
 to the distribution, searchBinaryPackages() and searchBinaryPackagesFTI().
@@ -291,7 +295,8 @@
     [u'mozilla-firefox']
 
 
-=== Finding distroseriess and pockets from distribution names ===
+Finding distroseriess and pockets from distribution names
+.........................................................
 
 A distribution knows what distroseriess it has. Those distroseriess have
 pockets which have suffixes used by the archive publisher. Because we
@@ -336,26 +341,27 @@
     NotFoundError: 'hoary-bullshit'
 
 
-=== Upload related stuff ===
+Upload related stuff
+....................
 
 When uploading to a distribution we need to query its uploaders. Each
 uploader record is in fact an ArchivePermission record that tells us
 what component is uploadable to by what person or group of people.
 
-   >>> from operator import attrgetter
-   >>> for permission in sorted(
-   ...     ubuntu.uploaders, key=attrgetter("id")):
-   ...     assert not permission.archive.is_ppa
-   ...     print permission.component.name
-   ...     print permission.person.displayname
-   universe
-   Ubuntu Team
-   restricted
-   Ubuntu Team
-   main
-   Ubuntu Team
-   partner
-   Canonical Partner Developers
+    >>> from operator import attrgetter
+    >>> for permission in sorted(
+    ...     ubuntu.uploaders, key=attrgetter("id")):
+    ...     assert not permission.archive.is_ppa
+    ...     print permission.component.name
+    ...     print permission.person.displayname
+    universe
+    Ubuntu Team
+    restricted
+    Ubuntu Team
+    main
+    Ubuntu Team
+    partner
+    Canonical Partner Developers
 
 When processing an upload we may want to find a file (E.g. if an
 incomplete source is uploaded).
@@ -375,7 +381,8 @@
     AssertionError: searching in an explicitly empty space is pointless
 
 
-=== Launchpad Usage ===
+Launchpad Usage
+...............
 
 A distribution can specify if it uses Malone, Rosetta, or Answers
 officially. Ubuntu uses all of them:
@@ -385,8 +392,8 @@
     >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
     >>> ubuntu.official_malone
     True
-    >>> ubuntu.official_rosetta
-    True
+    >>> ubuntu.translations_usage.name
+    'LAUNCHPAD'
     >>> ubuntu.official_answers
     True
     >>> ubuntu.official_blueprints
@@ -397,12 +404,12 @@
     >>> print ubuntu.bug_tracking_usage.name
     LAUNCHPAD
 
-While the other attributes track the other official_ attributes. 
+While the other attributes track the other official_ attributes.
 
     >>> print ubuntu.official_rosetta
     True
     >>> print ubuntu.translations_usage.name
-    LAUNCHPAD 
+    LAUNCHPAD
     >>> print ubuntu.official_answers
     True
     >>> print ubuntu.answers_usage.name
@@ -412,7 +419,8 @@
     >>> print ubuntu.blueprints_usage.name
     LAUNCHPAD
 
-If the official_ attributes are False, the usage enums don't know anything.
+If the official_ attributes are False and the enum hasn't been set,
+the usage enums don't know anything.
 
     >>> login_person(ubuntu.owner.teamowner)
     >>> ubuntu.official_rosetta = False
@@ -422,37 +430,35 @@
 A distribution *cannot* specify that it uses codehosting. Currently there's
 no way for a distribution to use codehosting.
 
-    >>> ubuntu.official_codehosting
-    False
-    >>> ubuntu.official_codehosting = True
-    Traceback (most recent call last):
-    ForbiddenAttribute: ('official_codehosting', ...)
-
+    >>> from lp.app.enums import ServiceUsage
     >>> print ubuntu.codehosting_usage.name
     NOT_APPLICABLE
+    >>> ubuntu.codehosting_usage = ServiceUsage.LAUNCHPAD
+    Traceback (most recent call last):
+    AttributeError: can't set attribute...
 
 While Debian uses none:
 
     >>> debian = getUtility(ILaunchpadCelebrities).debian
-    >>> debian.official_malone
-    False
-    >>> debian.official_rosetta
-    False
-    >>> debian.official_answers
-    False
-    >>> debian.official_codehosting
-    False
-    >>> debian.official_blueprints
-    False
+    >>> print debian.bug_tracking_usage.name
+    UNKNOWN
+    >>> print debian.translations_usage.name
+    UNKNOWN
+    >>> print debian.answers_usage.name
+    UNKNOWN
+    >>> print debian.codehosting_usage.name
+    NOT_APPLICABLE
+    >>> print debian.blueprints_usage.name
+    UNKNOWN
 
 Gentoo only uses Malone
 
-    >>> print gentoo.official_malone
-    True
-    >>> print gentoo.official_rosetta
-    False
-    >>> print gentoo.official_answers
-    False
+    >>> print gentoo.bug_tracking_usage.name
+    LAUNCHPAD
+    >>> print gentoo.translations_usage.name
+    UNKNOWN
+    >>> print gentoo.answers_usage.name
+    UNKNOWN
 
 Launchpad admins and the distro owner can set these fields.
 
@@ -464,9 +470,9 @@
     >>> debian.official_malone = True
     >>> debian.official_malone
     True
-    >>> debian.official_rosetta = True
-    >>> debian.official_rosetta
-    True
+    >>> debian.translations_usage = ServiceUsage.LAUNCHPAD
+    >>> debian.translations_usage.name
+    'LAUNCHPAD'
 
     >>> debian_owner = factory.makePerson()
     >>> debian.owner = debian_owner
@@ -484,12 +490,13 @@
     >>> debian.official_malone = True
     Traceback (most recent call last):
     Unauthorized: (..., 'official_malone', 'launchpad.Edit')
-    >>> debian.official_rosetta = True
+    >>> debian.translations_usage = ServiceUsage.LAUNCHPAD
     Traceback (most recent call last):
-    Unauthorized: (..., 'official_rosetta', 'launchpad.Edit')
-
-
-=== Specification Listings ===
+    Unauthorized: (..., 'translations_usage', 'launchpad.Edit')
+
+
+Specification Listings
+......................
 
 We should be able to get lists of specifications in different states
 related to a distro.
@@ -497,90 +504,93 @@
 Basically, we can filter by completeness, and by whether or not the spec is
 informational.
 
- >>> kubuntu = distroset.getByName("kubuntu")
+    >>> kubuntu = distroset.getByName("kubuntu")
 
- >>> from canonical.launchpad.interfaces import SpecificationFilter
+    >>> from canonical.launchpad.interfaces import SpecificationFilter
 
 First, there should be one informational spec for kubuntu, but it is
 complete so it will not show up unless we explicitly ask for complete specs:
 
- >>> filter = [SpecificationFilter.INFORMATIONAL]
- >>> kubuntu.specifications(filter=filter).count()
- 0
- >>> filter = [SpecificationFilter.INFORMATIONAL,
- ...           SpecificationFilter.COMPLETE]
- >>> kubuntu.specifications(filter=filter).count()
- 1
+    >>> filter = [SpecificationFilter.INFORMATIONAL]
+    >>> kubuntu.specifications(filter=filter).count()
+    0
+    >>> filter = [SpecificationFilter.INFORMATIONAL,
+    ...           SpecificationFilter.COMPLETE]
+    >>> kubuntu.specifications(filter=filter).count()
+    1
 
 
 There are 2 completed specs for Kubuntu:
 
- >>> filter = [SpecificationFilter.COMPLETE]
- >>> for spec in kubuntu.specifications(filter=filter):
- ...    print spec.name, spec.is_complete
- thinclient-local-devices True
- usplash-on-hibernation True
+    >>> filter = [SpecificationFilter.COMPLETE]
+    >>> for spec in kubuntu.specifications(filter=filter):
+    ...    print spec.name, spec.is_complete
+    thinclient-local-devices True
+    usplash-on-hibernation True
 
 
 And there are four incomplete specs:
 
- >>> filter = [SpecificationFilter.INCOMPLETE]
- >>> for spec in kubuntu.specifications(filter=filter):
- ...    print spec.name, spec.is_complete
- cluster-installation False
- revu False
- kde-desktopfile-langpacks False
- krunch-desktop-plan False
+    >>> filter = [SpecificationFilter.INCOMPLETE]
+    >>> for spec in kubuntu.specifications(filter=filter):
+    ...    print spec.name, spec.is_complete
+    cluster-installation False
+    revu False
+    kde-desktopfile-langpacks False
+    krunch-desktop-plan False
 
 
 If we ask for all specs, we get them in the order of priority.
 
- >>> filter = [SpecificationFilter.ALL]
- >>> for spec in kubuntu.specifications(filter=filter):
- ...    print spec.priority.title, spec.name
- Essential cluster-installation
- High revu
- Medium thinclient-local-devices
- Low usplash-on-hibernation
- Undefined kde-desktopfile-langpacks
- Not krunch-desktop-plan
+    >>> filter = [SpecificationFilter.ALL]
+    >>> for spec in kubuntu.specifications(filter=filter):
+    ...    print spec.priority.title, spec.name
+    Essential cluster-installation
+    High revu
+    Medium thinclient-local-devices
+    Low usplash-on-hibernation
+    Undefined kde-desktopfile-langpacks
+    Not krunch-desktop-plan
 
 
 And if we ask just for specs, we get the incomplete ones.
 
- >>> for spec in kubuntu.specifications():
- ...     print spec.name, spec.is_complete
- cluster-installation False
- revu False
- kde-desktopfile-langpacks False
- krunch-desktop-plan False
+    >>> for spec in kubuntu.specifications():
+    ...     print spec.name, spec.is_complete
+    cluster-installation False
+    revu False
+    kde-desktopfile-langpacks False
+    krunch-desktop-plan False
 
 We can filter for specifications that contain specific text:
 
- >>> for spec in kubuntu.specifications(filter=['package']):
- ...     print spec.name
- revu
+    >>> for spec in kubuntu.specifications(filter=['package']):
+    ...     print spec.name
+    revu
 
 We can get only valid specs (those that are not obsolete or superseded):
 
- >>> from canonical.launchpad.interfaces import SpecificationDefinitionStatus
- >>> login('[e-mail]')
- >>> for spec in kubuntu.specifications():
- ...     # Do this here, otherwise, the change will be flush before
- ...     # updateLifecycleStatus() acts and an IntegrityError will be
- ...     # raised.
- ...     owner = spec.owner
- ...     if spec.name in ['cluster-installation', 'revu']:
- ...         spec.definition_status = SpecificationDefinitionStatus.OBSOLETE
- ...     if spec.name in ['krunch-desktop-plan']:
- ...         spec.definition_status = SpecificationDefinitionStatus.SUPERSEDED
- ...     shim = spec.updateLifecycleStatus(owner)
- >>> for spec in kubuntu.valid_specifications:
- ...     print spec.name
- kde-desktopfile-langpacks
-
-
-== Milestones ==
+    >>> from canonical.launchpad.interfaces import (
+    ...     SpecificationDefinitionStatus,
+    ...     )
+    >>> login('[e-mail]')
+    >>> for spec in kubuntu.specifications():
+    ...     # Do this here, otherwise, the change will be flush before
+    ...     # updateLifecycleStatus() acts and an IntegrityError will be
+    ...     # raised.
+    ...     owner = spec.owner
+    ...     if spec.name in ['cluster-installation', 'revu']:
+    ...         spec.definition_status = SpecificationDefinitionStatus.OBSOLETE
+    ...     if spec.name in ['krunch-desktop-plan']:
+    ...         spec.definition_status = SpecificationDefinitionStatus.SUPERSEDED
+    ...     shim = spec.updateLifecycleStatus(owner)
+    >>> for spec in kubuntu.valid_specifications:
+    ...     print spec.name
+    kde-desktopfile-langpacks
+
+
+Milestones
+----------
 
 We can use IDistribution.milestones to get all milestones associated with any
 series of a distribution.
@@ -623,7 +633,8 @@
     [u'3.1', u'3.1-rc1', u'woody-rc1']
 
 
-== Archives ==
+Archives
+--------
 
 A distribution archive (primary, partner, debug or copy) can be retrieved
 by name using IDistribution.getArchive.

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2010-08-25 15:48:05 +0000
+++ lib/lp/registry/doc/product.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= Product =
+Product
+=======
 
 Launchpad keeps track of the "upstream" world as well as the "distro" world.
 The anchorpiece of the "upstream" world is the Product, which is a piece of
@@ -162,7 +163,8 @@
     Obsolete Junk
 
 
-== Translatable Products ==
+Translatable Products
+---------------------
 
 IProductSet will also tell us which products can be translated:
 
@@ -217,11 +219,11 @@
 The packaging table allows us to list source and distro source packages
 related to a certain upstream:
 
-   >>> alsa = productset.getByName('alsa-utils')
-   >>> [(sp.name, sp.distroseries.name) for sp in alsa.sourcepackages]
-   [(u'alsa-utils', u'sid'), (u'alsa-utils', u'warty')]
-   >>> [(sp.name, sp.distribution.name) for sp in alsa.distrosourcepackages]
-   [(u'alsa-utils', u'debian'), (u'alsa-utils', u'ubuntu')]
+    >>> alsa = productset.getByName('alsa-utils')
+    >>> [(sp.name, sp.distroseries.name) for sp in alsa.sourcepackages]
+    [(u'alsa-utils', u'sid'), (u'alsa-utils', u'warty')]
+    >>> [(sp.name, sp.distribution.name) for sp in alsa.distrosourcepackages]
+    [(u'alsa-utils', u'debian'), (u'alsa-utils', u'ubuntu')]
 
 The date_next_suggest_packaging attribute records the date when Launchpad can
 resume suggesting Ubuntu packages that the project provides. A value of None
@@ -270,7 +272,8 @@
     >>> from canonical.launchpad.interfaces import IBugTrackerSet
 
     >>> login_person(firefox.owner)
-    >>> gnome_bugzilla = getUtility(IBugTrackerSet).getByName('gnome-bugzilla')
+    >>> bug_tracker_set = getUtility(IBugTrackerSet)
+    >>> gnome_bugzilla = bug_tracker_set.getByName('gnome-bugzilla')
     >>> firefox.project.bugtracker = gnome_bugzilla
     >>> firefox.getExternalBugTracker() is None
     True
@@ -307,7 +310,8 @@
     True
 
 
-== Answer Tracking ==
+Answer Tracking
+---------------
 
 Firefox uses the Answer Tracker as the official application to provide
 answers to questions.
@@ -321,7 +325,8 @@
     False
 
 
-== Product Creation ==
+Product Creation
+----------------
 
 We can create new products with the createProduct() method:
 
@@ -374,20 +379,21 @@
     True
 
 
-== Specification Listings ==
+Specification Listings
+----------------------
 
 We should be able to set whether or not a Product uses specifications
 officially.  It defaults to False.
 
- >>> firefox = productset.getByName('firefox')
- >>> firefox.official_blueprints
- False
+    >>> firefox = productset.getByName('firefox')
+    >>> firefox.official_blueprints
+    False
 
 We can change it to True.
 
- >>> firefox.official_blueprints = True
- >>> firefox.official_blueprints
- True
+    >>> firefox.official_blueprints = True
+    >>> firefox.official_blueprints
+    True
 
 We should be able to get lists of specifications in different states
 related to a product.
@@ -395,39 +401,40 @@
 Basically, we can filter by completeness, and by whether or not the spec is
 informational.
 
- >>> firefox = productset.getByName('firefox')
- >>> from canonical.launchpad.interfaces import SpecificationFilter
+    >>> firefox = productset.getByName('firefox')
+    >>> from canonical.launchpad.interfaces import SpecificationFilter
 
 First, there should be only one informational spec for firefox:
 
- >>> filter = [SpecificationFilter.INFORMATIONAL]
- >>> for spec in firefox.specifications(filter=filter):
- ...    print spec.name
- extension-manager-upgrades
+    >>> filter = [SpecificationFilter.INFORMATIONAL]
+    >>> for spec in firefox.specifications(filter=filter):
+    ...    print spec.name
+    extension-manager-upgrades
 
 
 There are no completed specs for firefox:
 
- >>> filter = [SpecificationFilter.COMPLETE]
- >>> for spec in firefox.specifications(filter=filter):
- ...    print spec.name
+    >>> filter = [SpecificationFilter.COMPLETE]
+    >>> for spec in firefox.specifications(filter=filter):
+    ...    print spec.name
 
 
 And there are five incomplete specs:
 
- >>> filter = [SpecificationFilter.INCOMPLETE]
- >>> firefox.specifications(filter=filter).count()
- 5
+    >>> filter = [SpecificationFilter.INCOMPLETE]
+    >>> firefox.specifications(filter=filter).count()
+    5
 
 We can filter for specifications that contain specific text:
 
- >>> for spec in firefox.specifications(filter=['new']):
- ...     print spec.name
- canvas
- e4x
-
-
-== Milestones ==
+    >>> for spec in firefox.specifications(filter=['new']):
+    ...     print spec.name
+    canvas
+    e4x
+
+
+Milestones
+----------
 
 We can use IProduct.milestones to get all milestones associated with any
 ProductSeries of a product.
@@ -470,7 +477,8 @@
     [u'1.0.0', u'0.9.2', u'0.9.1', u'0.9', u'1.0', u'1.0-rc1']
 
 
-== Release ==
+Release
+-------
 
 All the releases for a Product can be retrieved through the releases property.
 
@@ -489,7 +497,8 @@
     0.9.1
 
 
-== Products With Branches ==
+Products With Branches
+----------------------
 
 Products are considered to officially support Launchpad as a location
 for their branches after a branch is set for the development focus
@@ -568,7 +577,8 @@
     landscape
 
 
-== Primary translatable ==
+Primary translatable
+--------------------
 
 Primary translatable series in a product should follow series where
 development is focused on.  To be able to do changes to facilitate
@@ -583,12 +593,18 @@
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
     >>> potemplate_set = getUtility(IPOTemplateSet)
 
+We're going to be setting the ServiceUsage values for products, so we
+need those enums.
+
+    >>> from lp.app.enums import ServiceUsage
+
 Firefox has two series, but no translatable series either:
 
     >>> firefox = productset.getByName('firefox')
     >>> for firefoxseries in firefox.series:
-    ...     print '%s %s' % (firefoxseries.displayname,
-    ...                      list(firefoxseries.getCurrentTranslationTemplates()))
+    ...     print '%s %s' % (
+    ...         firefoxseries.displayname,
+    ...         list(firefoxseries.getCurrentTranslationTemplates()))
     1.0 []
     trunk []
     >>> print firefox.primary_translatable
@@ -616,7 +632,7 @@
 And set that product as using translations officially. We need it so
 translations are available.
 
-    >>> firefox.official_rosetta = True
+    >>> firefox.translations_usage = ServiceUsage.LAUNCHPAD
 
 The primary_translatable now points at firefox 1.0:
 
@@ -642,7 +658,8 @@
     1.0
 
 
-= Series list =
+Series list
+===========
 
 The series for a product are returned as a sorted list, with the
 exception that the current development focus is first.
@@ -697,7 +714,8 @@
     ...     print series.name
     trunk
 
-= Changing ownership =
+Changing ownership
+==================
 
 If the owner of a project changes, all series and productreleases
 owned by the old owner are transfered to the new owner.

=== modified file 'lib/lp/registry/doc/project.txt'
--- lib/lp/registry/doc/project.txt	2010-06-07 07:52:45 +0000
+++ lib/lp/registry/doc/project.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= ProjectGroups =
+ProjectGroups
+=============
 
 A ProjectGroup is a group of Products, making it possible to for
 example see all bugs in the ProjectGroup's Product, or make them share a
@@ -11,7 +12,8 @@
     >>> projectset = getUtility(IProjectGroupSet)
 
 
-== Creating new projects ==
+Creating new projects
+---------------------
 
 When creating a new project there are a bunch of things we need to provide.
 While some of them (homepageurl, icon, logo and mugshot) are optional, others
@@ -28,7 +30,8 @@
     u'project-test'
 
 
-== Looking up existing projects ==
+Looking up existing projects
+----------------------------
 
 To fetch a project we use IProjectGroupSet.getByName() or
 IProjectGroupSet.__getitem__. The former will, by default, return active and
@@ -98,7 +101,8 @@
     >>> print projectgroups.getByName('gnome', ignore_inactive=True)
     None
 
-== Products which are part of a project ==
+Products which are part of a project
+------------------------------------
 
 The products which are part of a given project are given by a project's
 .products property. Note that only active products are included and they're
@@ -122,7 +126,8 @@
     >>> flush_database_updates()
 
 
-== Specification Listings ==
+Specification Listings
+----------------------
 
 We should be able to generate filtered lists of specs on a project.
 
@@ -200,7 +205,8 @@
     e4x
 
 
-== Specification Listings for a ProjectGroupSeries ==
+Specification Listings for a ProjectGroupSeries
+-----------------------------------------------
 
 An IProjectGroupSeries object can be retrieved by IProjectGroup.getSeries.
 
@@ -314,7 +320,8 @@
     e4x
 
 
-== translatables ==
+Translatables
+-------------
 
 A project would have IProduct objects that have resources to translate. This
 method return us the ones that are translatable and officially using Rosetta
@@ -349,8 +356,8 @@
 
 That is using Rosetta officially.
 
-    >>> evolution.official_rosetta
-    True
+    >>> print evolution.translations_usage.name
+    LAUNCHPAD
 
 GNOME project has also another product, netapplet.
 
@@ -361,8 +368,8 @@
 But it was not returned from 'translatables' method because it's not using
 Rosetta officially.
 
-    >>> netapplet.official_rosetta
-    False
+    >>> print netapplet.translations_usage.name
+    UNKNOWN
 
 And thus, it doesn't have any translatable series.
 
@@ -376,7 +383,8 @@
     1
 
 
-== Milestones ==
+Milestones
+----------
 
 A project can have virtual milestones. If any of its products has milestones,
 these milestones are also associated with the project.
@@ -398,7 +406,8 @@
     1.1. active: True
     1.1 active: True
 
-ProjectGroup.all_milestones is a list of all milestones associated with a project.
+ProjectGroup.all_milestones is a list of all milestones associated with a
+project.
 
     >>> milestones = gnome.all_milestones
     >>> for milestone in milestones:
@@ -410,8 +419,8 @@
     1.1. active: True
     1.1 active: True
 
-ProjectGroup.getMilestone(name) returns the project milestone with the name `name'
-or None, if no milestone with this name exists.
+ProjectGroup.getMilestone(name) returns the project milestone with the name
+`name' or None, if no milestone with this name exists.
 
     >>> milestone = gnome.getMilestone('1.1')
     >>> print milestone.name

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2010-08-24 19:06:33 +0000
+++ lib/lp/registry/model/projectgroup.py	2010-09-09 15:34:46 +0000
@@ -202,6 +202,9 @@
 
     def translatables(self):
         """See `IProjectGroup`."""
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this sql needs to be updated to
+        # check for the translations_usage, not official_rosetta.
         return Product.select('''
             Product.project = %s AND
             Product.official_rosetta = TRUE AND
@@ -271,7 +274,7 @@
 
         # filter based on completion. see the implementation of
         # Specification.is_complete() for more details
-        completeness =  Specification.completeness_clause
+        completeness = Specification.completeness_clause
 
         if SpecificationFilter.COMPLETE in filter:
             query += ' AND ( %s ) ' % completeness

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-09-09 14:11:43 +0000
+++ lib/lp/testing/factory.py	2010-09-09 15:34:46 +0000
@@ -93,6 +93,7 @@
     IStoreSelector,
     MAIN_STORE,
     )
+from lp.app.enums import ServiceUsage
 from lp.archiveuploader.dscfile import DSCFile
 from lp.archiveuploader.uploadpolicy import BuildDaemonUploadPolicy
 from lp.blueprints.interfaces.specification import (
@@ -838,7 +839,7 @@
         self, name=None, project=None, displayname=None,
         licenses=None, owner=None, registrant=None,
         title=None, summary=None, official_malone=None,
-        official_rosetta=None, bug_supervisor=None):
+        translations_usage=None, bug_supervisor=None):
         """Create and return a new, arbitrary Product."""
         if owner is None:
             owner = self.makePerson()
@@ -867,8 +868,9 @@
             registrant=registrant)
         if official_malone is not None:
             removeSecurityProxy(product).official_malone = official_malone
-        if official_rosetta is not None:
-            removeSecurityProxy(product).official_rosetta = official_rosetta
+        if translations_usage is not None:
+            naked_product = removeSecurityProxy(product)
+            naked_product.translations_usage = translations_usage
         if bug_supervisor is not None:
             naked_product = removeSecurityProxy(product)
             naked_product.bug_supervisor = bug_supervisor
@@ -2176,7 +2178,8 @@
             productseries = self.makeProductSeries(owner=owner)
             # Make it use Translations, otherwise there's little point
             # to us creating a template for it.
-            removeSecurityProxy(productseries).product.official_rosetta = True
+            naked_series = removeSecurityProxy(productseries)
+            naked_series.product.translations_usage = ServiceUsage.LAUNCHPAD
         templateset = getUtility(IPOTemplateSet)
         subset = templateset.getSubset(
             distroseries, sourcepackagename, productseries)

=== modified file 'lib/lp/translations/browser/potemplate.py'
--- lib/lp/translations/browser/potemplate.py	2010-08-25 20:04:40 +0000
+++ lib/lp/translations/browser/potemplate.py	2010-09-09 15:34:46 +0000
@@ -61,6 +61,7 @@
 from canonical.launchpad.webapp.launchpadform import ReturnToReferrerMixin
 from canonical.launchpad.webapp.menu import structured
 from canonical.lazr.utils import smartquote
+from lp.app.enums import service_uses_launchpad
 from lp.app.errors import NotFoundError
 from lp.registry.browser.productseries import ProductSeriesFacets
 from lp.registry.browser.sourcepackage import SourcePackageFacets
@@ -794,9 +795,10 @@
             product_or_distro = potemplate.productseries.product
         else:
             product_or_distro = potemplate.distroseries.distribution
-        official_rosetta = product_or_distro.official_rosetta
+        translations_usage = product_or_distro.translations_usage
 
-        if official_rosetta and potemplate.iscurrent:
+        if (service_uses_launchpad(translations_usage) and
+           potemplate.iscurrent):
             # This template is available for translation.
             return potemplate
         elif check_permission('launchpad.Edit', potemplate):

=== modified file 'lib/lp/translations/browser/product.py'
--- lib/lp/translations/browser/product.py	2010-08-24 10:45:57 +0000
+++ lib/lp/translations/browser/product.py	2010-09-09 15:34:46 +0000
@@ -19,6 +19,7 @@
     )
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.menu import NavigationMenu
+from lp.app.enums import service_uses_launchpad
 from lp.registry.browser.product import ProductEditView
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.productseries import IProductSeries
@@ -51,12 +52,14 @@
     def translationdownload(self):
         text = 'Download'
         preferred_series = self.context.primary_translatable
-        enabled = (self.context.official_rosetta and
-            preferred_series is not None)
+        enabled = (service_uses_launchpad(self.context.translations_usage)
+            and preferred_series is not None)
         link = ''
         if enabled:
             link = canonical_url(
-                preferred_series, rootsite='translations', view_name='+export')
+                preferred_series,
+                rootsite='translations',
+                view_name='+export')
             text = 'Download "%s"' % preferred_series.name
 
         return Link(link, text, icon='download', enabled=enabled)
@@ -90,19 +93,19 @@
     @cachedproperty
     def uses_translations(self):
         """Whether this product has translatable templates."""
-        return (self.context.official_rosetta and
-                self.primary_translatable is not None)
+        return (service_uses_launchpad(self.context.translations_usage)
+                and self.primary_translatable is not None)
 
     @cachedproperty
     def no_translations_available(self):
         """Has no translation templates but does support translations."""
-        return (self.context.official_rosetta and
-                self.primary_translatable is None)
+        return (service_uses_launchpad(self.context.translations_usage)
+                and self.primary_translatable is None)
 
     @cachedproperty
     def show_page_content(self):
         """Whether the main content of the page should be shown."""
-        return (self.context.official_rosetta or
+        return (service_uses_launchpad(self.context.translations_usage) or
                 check_permission("launchpad.TranslationsAdmin", self.context))
 
     @cachedproperty

=== modified file 'lib/lp/translations/browser/tests/language-views.txt'
--- lib/lp/translations/browser/tests/language-views.txt	2010-07-16 16:51:52 +0000
+++ lib/lp/translations/browser/tests/language-views.txt	2010-09-09 15:34:46 +0000
@@ -143,7 +143,10 @@
 
 Create a product, a template with one msgset and a pofile
 
-    >>> product = factory.makeProduct(official_rosetta=True)
+    >>> from lp.app.enums import ServiceUsage
+
+    >>> product = factory.makeProduct(
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> template = factory.makePOTemplate(
     ...     productseries=product.getSeries('trunk'))
     >>> potmsgset = factory.makePOTMsgSet(template)

=== modified file 'lib/lp/translations/browser/tests/test_breadcrumbs.py'
--- lib/lp/translations/browser/tests/test_breadcrumbs.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/browser/tests/test_breadcrumbs.py	2010-09-09 15:34:46 +0000
@@ -6,6 +6,7 @@
 from zope.component import getUtility
 
 from canonical.lazr.utils import smartquote
+from lp.app.enums import ServiceUsage
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 from lp.testing.factory import remove_security_proxy_and_shout_at_engineer
@@ -152,7 +153,7 @@
     def test_potemplate(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester",
-            official_rosetta=True)
+            translations_usage=ServiceUsage.LAUNCHPAD)
         series = self.factory.makeProductSeries(
             name="test", product=product)
         potemplate = self.factory.makePOTemplate(
@@ -176,7 +177,7 @@
     def test_pofiletranslate(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester",
-            official_rosetta=True)
+            translations_usage=ServiceUsage.LAUNCHPAD)
         series = self.factory.makeProductSeries(name="test", product=product)
         potemplate = self.factory.makePOTemplate(series, name="test-template")
         pofile = self.factory.makePOFile('eo', potemplate)

=== modified file 'lib/lp/translations/doc/potmsgset.txt'
--- lib/lp/translations/doc/potmsgset.txt	2010-09-01 10:03:11 +0000
+++ lib/lp/translations/doc/potmsgset.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= POTMsgSet tests =
+POTMsgSet tests
+===============
 
 POTMsgSet represents messages to translate that a POTemplate file has.
 
@@ -17,7 +18,9 @@
     ...     ILanguageSet, IPersonSet, IProductSet)
 
     >>> potemplate = factory.makePOTemplate()
-    >>> potmsgset = factory.makePOTMsgSet(potemplate=potemplate, singular="bla")
+    >>> potmsgset = factory.makePOTMsgSet(
+    ...     potemplate=potemplate,
+    ...     singular="bla")
 
 Verify interface.
 
@@ -31,7 +34,8 @@
     >>> import pytz
 
 
-== POTMsgSet.is_translation_credit and POTMsgSet.translation_credit_type ==
+POTMsgSet.is_translation_credit and POTMsgSet.translation_credit_type
+---------------------------------------------------------------------
 
 A POTMsgSet can be translation credits. These have special msgids that may
 differ for historical reason for the same type of credit. The property
@@ -51,7 +55,8 @@
     Gnome credits message
 
 
-== POTMsgSet.normalizeWhitespaces ==
+POTMsgSet.normalizeWhitespaces
+------------------------------
 
 This function copies the leading and trailing whitespaces from
 POTMsgSet's msgid into the 'text' argument.
@@ -96,7 +101,8 @@
     True
 
 
-== POTMsgSet.convertDotToSpace ==
+POTMsgSet.convertDotToSpace
+---------------------------
 
 This method changes the u'\u2022' char by the normal white space.
 
@@ -126,14 +132,17 @@
     u'a string with the char \u2022'
 
 
-== POTMsgSet.normalizeNewLines ==
+POTMsgSet.normalizeNewLines
+---------------------------
 
 This method syncs the new line chars to use the same as the associated msgid.
 
 As this test is too specific, we are going to change a msgid as we need for
 every test.
 
-    >>> potmsgset_windows = factory.makePOTMsgSet(potemplate, singular=u'\r\n')
+    >>> potmsgset_windows = factory.makePOTMsgSet(
+    ...                             potemplate,
+    ...                             singular=u'\r\n')
     >>> potmsgset_unix = factory.makePOTMsgSet(potemplate, singular=u'\n')
     >>> potmsgset_mac = factory.makePOTMsgSet(potemplate, singular=u'\r')
     >>> text_windows = u'\r\n'
@@ -180,7 +189,8 @@
     BrokenTextError: ...
 
 
-== POTMsgSet.applySanityFixes ==
+POTMsgSet.applySanityFixes
+--------------------------
 
 This function applies all checks we know to fix broken input
 
@@ -199,7 +209,8 @@
     u'\nTranslation\nto test\n'
 
 
-== POTMsgSet.updateTranslation ==
+POTMsgSet.updateTranslation
+---------------------------
 
 This method is the core piece of Translations infrastructure: it
 updates a single language translation for a POTMsgSet, and modifies a
@@ -309,7 +320,8 @@
     >>> current.date_created is None
     False
 
-=== Unsetting a translation from the import ===
+Unsetting a translation from the import
+.......................................
 
 A translation can be removed from the import by being set to an empty string.
 
@@ -349,7 +361,8 @@
     >>> upstream_pofile.updateStatistics()
     (0, 0, 0, 2)
 
-=== Activating an existing suggestion ===
+Activating an existing suggestion
+.................................
 
 Foo Bar is a privileged translator who can do reviews and submit translations
 directly, while No Privileges user can only submit suggestions.
@@ -438,7 +451,8 @@
     u'Foo Bar'
 
 
-== Plural forms ==
+Plural forms
+------------
 
 Let's focus on handling of messages with plural forms.
 
@@ -513,7 +527,8 @@
     [None, None, None]
 
 
-=== Missing forms ===
+Missing forms
+.............
 
 Even when a message has a singular and a plural in English, a
 translation does not have to cover all plural forms available in the
@@ -538,7 +553,8 @@
     False
 
 
-=== Extraneous forms ===
+Extraneous forms
+................
 
 It's not normally possible to input more plural forms for a translated
 message than the language has.  But that number is configurable, and can
@@ -614,7 +630,8 @@
 possible.
 
 
-== isTranslationNewerThan ==
+isTranslationNewerThan
+----------------------
 
 This method tells us whether the active translation was reviewed after
 the given timestamp.
@@ -633,7 +650,8 @@
     False
 
 
-== External translation suggestions ==
+External translation suggestions
+--------------------------------
 
 External translation suggestions are current, imported or suggested
 translation for exactly the same English string, but in a different
@@ -670,7 +688,8 @@
     ...         print line
 
 
-== POTMsgSet.getExternallyUsedTranslationMessages ==
+POTMsgSet.getExternallyUsedTranslationMessages
+----------------------------------------------
 
  On one side, we have a translation template for the evolution product.
 
@@ -692,10 +711,10 @@
 
 Both, product and distribution use Launchpad Translations.
 
-    >>> evolution.official_rosetta
-    True
-    >>> ubuntu.official_rosetta
-    True
+    >>> evolution.translations_usage.name
+    'LAUNCHPAD'
+    >>> ubuntu.translations_usage.name
+    'LAUNCHPAD'
 
 And both translation templates are current
 
@@ -754,7 +773,9 @@
 The same happens if the distribution is not officially using
 translations.
 
-    >>> ubuntu.official_rosetta = False
+    >>> from lp.app.enums import ServiceUsage
+
+    >>> ubuntu.translations_usage = ServiceUsage.NOT_APPLICABLE
 
     # We set the template as current again so we are sure that we don't show
     # suggestions just due to the change to the official_rosetta flag.
@@ -767,7 +788,7 @@
 
 And products not using translations officially have the same behaviour.
 
-    >>> evolution.official_rosetta = False
+    >>> evolution.translations_usage = ServiceUsage.NOT_APPLICABLE
     >>> transaction.commit()
     >>> suggestions = evo_distro_message.getExternallyUsedTranslationMessages(
     ...    spanish)
@@ -776,12 +797,13 @@
 
 Let's restore the flags for next section.
 
-    >>> ubuntu.official_rosetta = True
-    >>> evolution.official_rosetta = True
+    >>> ubuntu.translations_usage = ServiceUsage.LAUNCHPAD
+    >>> evolution.translations_usage = ServiceUsage.LAUNCHPAD
     >>> transaction.commit()
 
 
-== POTMsgSet.getExternallySuggestedTranslationMessages ==
+POTMsgSet.getExternallySuggestedTranslationMessages
+---------------------------------------------------
 
 This method returns a set of submissions that have suggested translations
 for the same msgid as the given POTMsgSet across the whole system.
@@ -876,7 +898,7 @@
     # We set the template as current again so we are sure that we don't show
     # suggestions just due to the change to the official_rosetta flag.
     >>> potmsgset_translated.potemplate.iscurrent = True
-    >>> ubuntu.official_rosetta = False
+    >>> ubuntu.translations_usage = ServiceUsage.NOT_APPLICABLE
     >>> transaction.commit()
 
     >>> wiki_submissions = (
@@ -886,7 +908,8 @@
     0
 
 
-== POTMsgSet.getCurrentDummyTranslationMessage ==
+POTMsgSet.getCurrentDummyTranslationMessage
+-------------------------------------------
 
 Sometimes, there are POTMsgSet objects with no translations to a language,
 and we need to get dummy objects which emulate them to do read operations.
@@ -908,7 +931,8 @@
     AssertionError: There is already a translation message ...
 
 
-== Suggestions for translator credits ==
+Suggestions for translator credits
+----------------------------------
 
 Messages with translator credits are translated automatically by
 Launchpad, so we should not get any suggestions for them.
@@ -936,8 +960,8 @@
 
 Now, let's add 'translation-credits' message to a different POTemplate:
 
-     >>> new_credits = evolution_potemplate.createMessageSetFromText(
-     ...     singular_text=u'translation-credits', plural_text=None)
+    >>> new_credits = evolution_potemplate.createMessageSetFromText(
+    ...     singular_text=u'translation-credits', plural_text=None)
 
 However, this one doesn't show up as external suggestion for Spanish.
 
@@ -946,7 +970,8 @@
     >>> new_credits.getExternallySuggestedTranslationMessages(spanish)
     []
 
-== POTMsgSet.setSequence ==
+POTMsgSet.setSequence
+---------------------
 
 Finally, the new `IPOTMsgSet` should have an entry in the
 `TranslationTemplateItem` table once we assign a sequence number.
@@ -998,7 +1023,8 @@
     0
 
 
-== POTMsgSet.flags ==
+POTMsgSet.flags
+---------------
 
 The gettext format can associate flags with a POTMsgSet, such as "this
 is a fuzzily matched message" or "this message follows C format-string

=== modified file 'lib/lp/translations/doc/translationimportqueue.txt'
--- lib/lp/translations/doc/translationimportqueue.txt	2010-07-13 21:49:34 +0000
+++ lib/lp/translations/doc/translationimportqueue.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= TranslationImportQueueEntry =
+TranslationImportQueueEntry
+===========================
 
 The TranslationImportQueueEntry is an entry of the queue that will be imported
 into Rosetta.
@@ -14,7 +15,8 @@
     ...     store.find(TranslationImportQueueEntry).remove()
 
 
-== getGuessedPOFile ==
+getGuessedPOFile
+----------------
 
 This property gives us the IPOFile where we think we should import this entry.
 
@@ -59,7 +61,8 @@
     ...     u'po/sr.po', 'foo', True, rosetta_experts,
     ...      productseries=evolution_productseries)
 
-This entry has no information about the IPOFile where it should be attached to:
+This entry has no information about the IPOFile where it should be attached
+to:
 
     >>> entry.import_into is None
     True
@@ -82,7 +85,8 @@
     ...      sourcepackagename=evolution_sourcepackagename)
     >>> transaction.commit()
 
-This entry has no information about the IPOFile where it should be attached to:
+This entry has no information about the IPOFile where it should be attached
+to:
 
     >>> entry.import_into is None
     True
@@ -225,7 +229,8 @@
     >>> pofile.path
     u'po/sr.po'
 
-=== getGuessedPOFile with KDE ===
+getGuessedPOFile with KDE
+.........................
 
 Official KDE packages have a non standard layout where the .pot files are
 stored inside the sourcepackage with the binaries that will use it and the
@@ -363,7 +368,8 @@
     >>> transaction.abort()
 
 
-=== getGuessedPOFile with KOffice ===
+getGuessedPOFile with KOffice
+.............................
 
 Like official KDE packages, KOffice stores the .pot and .po files in different
 packages, the only difference it has is that there is just one source package
@@ -403,7 +409,9 @@
 
 And set this entry as already imported.
 
-    >>> koffice_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
+    >>> koffice_pot_entry.setStatus(
+    ...     RosettaImportStatus.IMPORTED,
+    ...     rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file from koffice-l10n
@@ -449,7 +457,8 @@
     >>> transaction.abort()
 
 
-=== getGuessedPOFile with .po files in different directories ===
+getGuessedPOFile with .po files in different directories
+........................................................
 
 Some packages have translations and templates inside the same package, but
 they don't have them inside the same directory. The layout is:
@@ -500,7 +509,9 @@
 
 And set this entry as already imported.
 
-    >>> adept_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
+    >>> adept_pot_entry.setStatus(
+    ...     RosettaImportStatus.IMPORTED,
+    ...     rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -551,7 +562,9 @@
 
 And set this entry as already imported.
 
-    >>> ktorrent_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
+    >>> ktorrent_pot_entry.setStatus(
+    ...     RosettaImportStatus.IMPORTED,
+    ...     rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -739,7 +752,8 @@
     >>> transaction.abort()
 
 
-== executeOptimisticBlock ==
+executeOptimisticBlock
+----------------------
 
 This method looks on the queue to find entries to block based on other .pot
 entries that are stored on the same directory and are already blocked.
@@ -803,7 +817,8 @@
     True
 
 On the other hand, this other one is for the same
-distroseries/sourcepackagename than the .pot file we have so it's also blocked.
+distroseries/sourcepackagename than the .pot file we have so it's also
+blocked.
 
     >>> entry4 = translationimportqueue.get(4)
     >>> entry4.path
@@ -820,7 +835,8 @@
     True
 
 
-== getElapsedTimeText ==
+getElapsedTimeText
+-----------------
 
 This method returns a string representing the elapsed time since the entry
 was added to the queue.
@@ -860,13 +876,15 @@
     '2 days 13 hours 5 minutes ago'
 
 
-= TranslationImportQueue =
+TranslationImportQueue
+======================
 
 The translation import queue is the place where the new translation imports
 end before being imported into Rosetta.
 
 
-== getTemplatesOnSameDirectory ==
+getTemplatesOnSameDirectory
+---------------------------
 
 This method allows us to get the set of .pot files we have on the same
 directory that a given entry.
@@ -905,7 +923,8 @@
     0
 
 
-== getRequestTargets ==
+getRequestTargets
+-----------------
 
     >>> # Helper functions
     >>> def get_target_names(status=None):
@@ -1069,7 +1088,8 @@
     firefox         Mozilla Firefox
     ubuntu/hoary    Hoary
 
-== addOrUpdateEntry() ==
+addOrUpdateEntry()
+------------------
 
 addOrUpdateEntry adds a new entry to the import queue so we can handle it
 later with poimport script.
@@ -1264,7 +1284,8 @@
     >>> print entry.content.read()
     New bar content
 
-= Filename filters =
+Filename filters
+================
 
 A tarball doesn't always have everything in quite the right place.  If
 you need to manipulate the file paths within a tarball before the files
@@ -1307,7 +1328,8 @@
     netapplet       | None               | new-directory/fr.po
 
 
-= Invalid data =
+Invalid data
+============
 
 If administrators fail to correct certain errors in requests while approving
 them, and the admin user interface mistakenly accepts the approval, we may
@@ -1385,7 +1407,8 @@
     >>> clear_queue(translationimportqueue)
 
 
-== getRequestTargets output ordering ==
+getRequestTargets output ordering
+---------------------------------
 
 The queue is populated with a wild mix of requests: for packages in
 different release series of Ubuntu, for packages in different distros,
@@ -1472,7 +1495,8 @@
     evolution           Evolution
 
 
-== cleanUpQueue ==
+cleanUpQueue
+------------
 
 The queue is cleaned up regularly.
 
@@ -1489,7 +1513,8 @@
     0
 
 
-=== State and Age ===
+State and Age
+.............
 
 Entries can be cleaned up because they have been in a specific state for
 at least a specified period of time.
@@ -1516,18 +1541,22 @@
     >>> print_queue_entries(translationimportqueue)
 
 
-=== Deactivated Products ===
+Deactivated Products
+....................
 
 Another reason for deleting entries is that they belong to products that
 have been deactivated.
 
 A user sets up Jokosher for translation, and uploads a template.
 
+    >>> from lp.app.enums import ServiceUsage
+
     >>> jokosher = productset['jokosher']
     >>> jokosher_trunk = jokosher.getSeries('trunk')
-    >>> jokosher.official_rosetta = True
+    >>> jokosher.translations_usage = ServiceUsage.LAUNCHPAD
     >>> syncUpdate(jokosher)
-    >>> jokosher_subset = potemplateset.getSubset(productseries=jokosher_trunk)
+    >>> jokosher_subset = potemplateset.getSubset(
+    ...     productseries=jokosher_trunk)
     >>> template = jokosher_subset.new(
     ...     'jokosher', 'jokosher', 'jokosher.pot', rosetta_experts)
     >>> syncUpdate(template)

=== modified file 'lib/lp/translations/doc/translationmessage-destroy.txt'
--- lib/lp/translations/doc/translationmessage-destroy.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/doc/translationmessage-destroy.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-== destroySelf ==
+destroySelf
+===========
 
 (Note: this test runs as rosettaadmin to obtain the necessary
 privileges)
@@ -26,7 +27,8 @@
     SQLObjectNotFound:...
 
 
-== POFileTranslator update on remove ==
+POFileTranslator update on remove
+=================================
 
 In two sharing POTemplates with one shared POTMsgSet with one shared
 translation, we get two POFileTranslator records for each of the POFiles.
@@ -35,16 +37,17 @@
     >>> # a global 'postgres' permission which allows everything.
     >>> LaunchpadZopelessLayer.switchDbUser('postgres')
     >>> from canonical.database.sqlbase import sqlvalues
+    >>> from lp.app.enums import ServiceUsage
     >>> from lp.translations.model.pofiletranslator import POFileTranslator
     >>> from lp.testing.factory import LaunchpadObjectFactory
     >>> factory = LaunchpadObjectFactory()
 
-    >>> foo = factory.makeProduct()
+    >>> foo = factory.makeProduct(
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> foo_devel = factory.makeProductSeries(
     ...     name='devel', product=foo)
     >>> foo_stable = factory.makeProductSeries(
     ...     name='stable', product=foo)
-    >>> foo.official_rosetta = True
     >>> devel_potemplate = factory.makePOTemplate(
     ...     productseries=foo_devel, name="messages")
     >>> stable_potemplate = factory.makePOTemplate(foo_stable,
@@ -56,7 +59,9 @@
     >>> potmsgset = factory.makePOTMsgSet(devel_potemplate, sequence=1)
     >>> potmsgset.setSequence(stable_potemplate, 1)
     >>> tm = factory.makeTranslationMessage(
-    ...     pofile=devel_sr_pofile, potmsgset=potmsgset, translations=[u"blah"])
+    ...     pofile=devel_sr_pofile,
+    ...     potmsgset=potmsgset,
+    ...     translations=[u"blah"])
     >>> print POFileTranslator.select(
     ...     "latest_message=%s" % sqlvalues(tm)).count()
     2

=== modified file 'lib/lp/translations/doc/translations-export-to-branch.txt'
--- lib/lp/translations/doc/translations-export-to-branch.txt	2010-07-20 17:50:45 +0000
+++ lib/lp/translations/doc/translations-export-to-branch.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= Exporting translations to a bzr branch =
+Exporting translations to a bzr branch
+======================================
 
 The translations-export-to-branch script visits all ProductSeries with a
 translations_branch set, and for each, exports the series' translations
@@ -76,10 +77,11 @@
 branch.
 
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.app.enums import ServiceUsage
 
     >>> gazblachko = removeSecurityProxy(factory.makeProduct(
     ...     name='gazblachko', displayname='Gazblachko'))
-    >>> gazblachko.official_rosetta = True
+    >>> gazblachko.translations_usage = ServiceUsage.LAUNCHPAD
 
     >>> branch = removeSecurityProxy(factory.makeBranch(
     ...     name='gazpo', owner=gazblachko.owner, product=gazblachko))
@@ -162,13 +164,13 @@
 When Gazblachko stops using Launchpad for Translations, the exports stop
 also.
 
-    >>> gazblachko.official_rosetta = False
+    >>> gazblachko.translations_usage = ServiceUsage.NOT_APPLICABLE
     >>> transaction.commit()
     >>> script.main()
     INFO Exporting to translations branches.
     INFO Processed 0 item(s); 0 failure(s), 0 unpushed branch(es).
 
-    >>> gazblachko.official_rosetta = True
+    >>> gazblachko.translations_usage = ServiceUsage.LAUNCHPAD
     >>> transaction.commit()
 
 
@@ -271,7 +273,8 @@
 collected for import yet.
 
 
-=== Branch races ===
+Branch races
+............
 
 Any translations coming in through a branch push are safe once they're
 in the translations import queue.  So the race window spans from the
@@ -299,7 +302,8 @@
     INFO Processed 1 item(s); 1 failure(s), 0 unpushed branch(es).
 
 
-=== Pending imports from same branch ===
+Pending imports from same branch
+................................
 
 Another race condition is detected by the script itself: there may be
 pending translations BranchJobs on the branch.

=== modified file 'lib/lp/translations/doc/translationsoverview.txt'
--- lib/lp/translations/doc/translationsoverview.txt	2009-07-24 12:55:03 +0000
+++ lib/lp/translations/doc/translationsoverview.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= TranslationsOverview =
+TranslationsOverview
+====================
 
 This class provides a basic overview of the Launchpad Translations component.
 It includes data such as projects which have so far received the most
@@ -45,14 +46,16 @@
     18
 
 
-== _normalizeSizes ==
+_normalizeSizes
+---------------
 
 This private method accepts a list of tuples (object, size) and
 normalizes `size` values into the range [MINIMUM_SIZE, MAXIMUM_SIZE].
 
     >>> test_list = [('one', 3), ('two', 0), ('three', 1)]
     >>> from zope.security.proxy import removeSecurityProxy
-    >>> result = removeSecurityProxy(overview)._normalizeSizes(test_list, 0, 3)
+    >>> naked_overview = removeSecurityProxy(overview)
+    >>> result = naked_overview._normalizeSizes(test_list, 0, 3)
     >>> for pillar in result:
     ...     print "%s: %d" % (pillar['pillar'], pillar['weight'])
     one: 18
@@ -60,7 +63,8 @@
     three: 13
 
 
-== Getting the most translated pillars ==
+Getting the most translated pillars
+-----------------------------------
 
 Method getMostTranslatedPillars() returns a list of dicts listing
 pillars with most translations karma so far, along with a relative
@@ -104,10 +108,13 @@
 
 Adding a little bit of karma to upstart will put it in the list as well.
 
+    >>> from lp.app.enums import ServiceUsage
+
     >>> start_karma_update()
     >>> upstart = product_set.getByName('upstart')
     >>> upstart_id = upstart.id
-    >>> removeSecurityProxy(upstart).official_rosetta = True
+    >>> naked_upstart = removeSecurityProxy(upstart)
+    >>> naked_upstart.translations_usage = ServiceUsage.LAUNCHPAD
     >>> cache_entry = karmacachemanager.new(
     ...     50, carlos.id, translations.id, product_id=upstart_id)
     >>> finish_karma_update()
@@ -153,7 +160,8 @@
     Ubuntu: 24
 
 
-== Zero karma ==
+Zero karma
+----------
 
 Sometimes a pillar appears to be listed in the karma cache with zero
 karma.  Our algorithm takes the logarithm of its karma, but it's

=== modified file 'lib/lp/translations/model/potemplate.py'
--- lib/lp/translations/model/potemplate.py	2010-09-03 03:12:39 +0000
+++ lib/lp/translations/model/potemplate.py	2010-09-09 15:34:46 +0000
@@ -64,6 +64,7 @@
     IMasterStore,
     IStore,
     )
+from lp.app.enums import service_uses_launchpad
 from lp.app.errors import NotFoundError
 from lp.registry.interfaces.person import validate_public_person
 from lp.registry.model.sourcepackagename import SourcePackageName
@@ -1322,8 +1323,7 @@
             preferred_matches = [
                 match
                 for match in matches
-                if match.from_sourcepackagename == sourcepackagename
-            ]
+                if match.from_sourcepackagename == sourcepackagename]
 
             if len(preferred_matches) == 1:
                 return preferred_matches[0]
@@ -1378,6 +1378,9 @@
 
     def populateSuggestivePOTemplatesCache(self):
         """See `IPOTemplateSet`."""
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this sql needs to be updated to
+        # check for the translations_usage, not official_rosetta.
         return IMasterStore(POTemplate).execute("""
             INSERT INTO SuggestivePOTemplate (
                 SELECT POTemplate.id
@@ -1437,15 +1440,13 @@
         if self.product:
             subsets = [
                 self.potemplateset.getSubset(productseries=series)
-                for series in self.product.series
-                ]
+                for series in self.product.series]
         else:
             subsets = [
                 self.potemplateset.getSubset(
                     distroseries=series,
                     sourcepackagename=self.sourcepackagename)
-                for series in self.distribution.series
-                ]
+                for series in self.distribution.series]
         for subset in subsets:
             for template in subset:
                 if name_pattern is None or re.match(name_pattern,
@@ -1548,8 +1549,7 @@
                 msgset.flags = set([
                     flag.strip()
                     for flag in row.flags_comment.split(',')
-                    if flag
-                    ])
+                    if flag])
 
             # Store the message.
             messages.append(msgset)
@@ -1578,8 +1578,9 @@
         collection = self.getTemplatesCollection()
 
         # XXX JeroenVermeulen 2010-07-15 bug=605924: Move the
-        # official_rosetta distinction into browser code.
-        if collection.target_pillar.official_rosetta:
+        # translations_usage distinction into browser code.
+        pillar = collection.target_pillar
+        if service_uses_launchpad(pillar.translations_usage):
             return collection.restrictCurrent(current_value)
         else:
             # Product/Distribution does not have translation enabled.

=== modified file 'lib/lp/translations/model/potmsgset.py'
--- lib/lp/translations/model/potmsgset.py	2010-09-06 03:35:47 +0000
+++ lib/lp/translations/model/potmsgset.py	2010-09-09 15:34:46 +0000
@@ -361,6 +361,9 @@
             query = ["(NOT %s)" % in_use_clause]
         query.append('TranslationMessage.language = %s' % sqlvalues(language))
 
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this sql needs to be updated
+        # to check for the translations_usage, not official_rosetta.
         query.append('''
             potmsgset IN (
                 SELECT POTMsgSet.id
@@ -381,7 +384,8 @@
                     POTMsgSet.id <> %s AND
                     msgid_singular = %s AND
                     POTemplate.iscurrent AND
-                    (Product.official_rosetta OR Distribution.official_rosetta)
+                    (Product.official_rosetta OR
+                        Distribution.official_rosetta)
             )''' % sqlvalues(self, self.msgid_singular))
 
         # Subquery to find the ids of TranslationMessages that are
@@ -396,8 +400,8 @@
             for form in xrange(TranslationConstants.MAX_PLURAL_FORMS)])
         ids_query_params = {
             'msgstrs': msgstrs,
-            'where': ' AND '.join(query)
-        }
+            'where': ' AND '.join(query),
+            }
         ids_query = '''
             SELECT DISTINCT ON (%(msgstrs)s)
                 TranslationMessage.id
@@ -565,8 +569,7 @@
         # plural forms.
         order.extend([
             'msgstr%s NULLS FIRST' % quote(form)
-            for form in remaining_plural_forms
-            ])
+            for form in remaining_plural_forms])
         matches = list(
             TranslationMessage.select(' AND '.join(clauses), orderBy=order))
 
@@ -722,7 +725,6 @@
         if is_imported or new_message == imported_message:
             new_message.is_imported = True
 
-
     def _isTranslationMessageASuggestion(self, force_suggestion,
                                          pofile, submitter,
                                          force_edition_rights, is_imported,
@@ -1178,4 +1180,3 @@
         """See `IPOTMsgSet`."""
         return TranslationTemplateItem.selectBy(
             potmsgset=self, orderBy=['id'])
-

=== modified file 'lib/lp/translations/model/translationsoverview.py'
--- lib/lp/translations/model/translationsoverview.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/model/translationsoverview.py	2010-09-09 15:34:46 +0000
@@ -39,13 +39,15 @@
             new_size = int(round(
                 real_minimum +
                 (size - offset - real_minimum) * multiplier))
-            normalized_sizes.append({'pillar' : pillar,
-                                     'weight' : new_size })
+            normalized_sizes.append({'pillar': pillar, 'weight': new_size})
         return normalized_sizes
 
     def getMostTranslatedPillars(self, limit=50):
         """See `ITranslationsOverview`."""
 
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this sql needs to be updated
+        # to check for the translations_usage, not official_rosetta.
         query = """
         SELECT LOWER(COALESCE(product_name, distro_name)) AS name,
                product_id,
@@ -65,7 +67,8 @@
                      distribution=distribution.id
               WHERE category=3 AND
                     (product IS NOT NULL OR distribution IS NOT NULL) AND
-                    (product.official_rosetta OR distribution.official_rosetta)
+                    (product.official_rosetta OR
+                        distribution.official_rosetta)
               GROUP BY product.displayname, product.id,
                        distribution.displayname, distribution.id
               HAVING SUM(karmavalue) > 0

=== modified file 'lib/lp/translations/model/translationsperson.py'
--- lib/lp/translations/model/translationsperson.py	2010-08-27 10:53:40 +0000
+++ lib/lp/translations/model/translationsperson.py	2010-09-09 15:34:46 +0000
@@ -262,6 +262,10 @@
         The added joins may make the overall query non-distinct, so be
         sure to enforce distinctness.
         """
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this query needs to be updated
+        # to check for the translations_usage, not official_rosetta.
+
         POTemplateJoin = Join(POTemplate, And(
             POTemplate.id == POFile.potemplateID,
             POTemplate.iscurrent == True))

=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-09-09 15:34:46 +0000
@@ -306,6 +306,9 @@
 
         self.store = getUtility(IStoreSelector).get(MAIN_STORE, SLAVE_FLAVOR)
 
+        # XXX j.c.sackett 2010-08-30 bug=627631 Once data migration has
+        # happened for the usage enums, this sql needs to be updated to
+        # check for the translations_usage, not official_rosetta.
         product_join = Join(
             ProductSeries, Product, ProductSeries.product == Product.id)
         productseries = self.store.using(product_join).find(

=== modified file 'lib/lp/translations/stories/buildfarm/xx-build-summary.txt'
--- lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2010-07-20 17:50:45 +0000
+++ lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2010-09-09 15:34:46 +0000
@@ -1,9 +1,11 @@
-= TranslationTemplatesBuildJob Build Summary =
+TranslationTemplatesBuildJob Build Summary
+==========================================
 
 The builders UI can show TranslationTemplateBuildJobs, although they
 look a little different from Soyuz-style jobs.
 
-== Setup ==
+Setup
+-----
 
 Create a builder working on a TranslationTemplatesBuildJob for a branch.
 
@@ -13,6 +15,7 @@
     >>> from canonical.launchpad.interfaces.librarian import (
     ...     ILibraryFileAliasSet)
     >>> from canonical.launchpad.scripts.logger import QuietFakeLogger
+    >>> from lp.app.enums import ServiceUsage
     >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
     >>> from lp.testing.factory import (
     ...     remove_security_proxy_and_shout_at_engineer)
@@ -32,7 +35,7 @@
     >>> productseries = factory.makeProductSeries(owner=owner)
     >>> product = productseries.product
     >>> naked_product = remove_security_proxy_and_shout_at_engineer(product)
-    >>> naked_product.official_rosetta = True
+    >>> naked_product.translations_usage = ServiceUsage.LAUNCHPAD
     >>> branch = factory.makeProductBranch(product=product, owner=owner)
     >>> branch_url = branch.unique_name
 
@@ -62,7 +65,8 @@
     ...     return find_tag_by_id(browser.contents, 'current-build-summary')
 
 
-== Show summary ==
+Show summary
+------------
 
 The job's summary shows that what type of job this is.  It also links
 to the branch.

=== modified file 'lib/lp/translations/stories/importqueue/xx-entry-details.txt'
--- lib/lp/translations/stories/importqueue/xx-entry-details.txt	2010-03-11 20:54:36 +0000
+++ lib/lp/translations/stories/importqueue/xx-entry-details.txt	2010-09-09 15:34:46 +0000
@@ -1,9 +1,11 @@
-= Entry details =
+Entry details
+=============
 
 The translation import queue entry page shows various details about an
 entry and its target that may be helpful in queue review.
 
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.app.enums import ServiceUsage
     >>> from lp.translations.model.translationimportqueue import (
     ...     TranslationImportQueue)
 
@@ -11,8 +13,8 @@
 
     >>> login(ANONYMOUS)
     >>> queue = TranslationImportQueue()
-    >>> product = factory.makeProduct()
-    >>> removeSecurityProxy(product).official_rosetta = True
+    >>> product = factory.makeProduct(
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> trunk = product.getSeries('trunk')
     >>> uploader = factory.makePerson()
     >>> entry = queue.addOrUpdateEntry(
@@ -47,7 +49,8 @@
     http://...foo.pot
 
 
-== Existing templates ==
+Existing templates
+------------------
 
 If there are translatable templates in the series, this will be stated
 and there will be a link to the templates list.
@@ -81,7 +84,8 @@
     ...
 
 
-== Source packages ==
+Source packages
+---------------
 
 The portlet shows different (well, less) information for uploads
 attached to distribution packages.

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-export-to-branch.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-export-to-branch.txt	2009-09-02 16:35:54 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-export-to-branch.txt	2010-09-09 15:34:46 +0000
@@ -1,15 +1,16 @@
-= ProductSeries Translations Branch =
+ProductSeries Translations Branch
+=================================
 
 If a ProductSeries has its translations_branch set, Launchpad will
 periodically commit snapshots of the series' translations to that
 branch.
 
-    >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.app.enums import ServiceUsage
 
     >>> login(ANONYMOUS)
     >>> owner = factory.makePerson(email='[e-mail]', password='****')
-    >>> product = factory.makeProduct(owner=owner)
-    >>> removeSecurityProxy(product).official_rosetta = True
+    >>> product = factory.makeProduct(owner=owner,
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> productseries = product.getSeries('trunk')
     >>> branch = factory.makeBranch(product=product, owner=owner)
     >>> branch_name = branch.name
@@ -99,7 +100,8 @@
     </div>
 
 
-== Disabling exports ==
+Disabling exports
+-----------------
 
 The field can also be cleared in order to disable the exports.
 
@@ -125,7 +127,8 @@
     None
 
 
-== Security ==
+Security
+--------
 
 You can only set the translations_branch to a branch that you own.
 Otherwise you'd be giving Launchpad a blanket license to commit

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-translations.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2010-03-31 20:25:33 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2010-09-09 15:34:46 +0000
@@ -5,9 +5,10 @@
 a single product series, or instructions on how to set up a series for
 translation.
 
+    >>> from lp.app.enums import ServiceUsage
     >>> login('[e-mail]')
-    >>> frobnicator = factory.makeProduct(name='frobnicator')
-    >>> frobnicator.official_rosetta = True
+    >>> frobnicator = factory.makeProduct(name='frobnicator',
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> frobnicator_trunk = frobnicator.getSeries('trunk')
     >>> frobnicator_trunk_url = canonical_url(
     ...     frobnicator_trunk, rootsite='translations')
@@ -148,7 +149,8 @@
 
     # Use the raw DB object to bypass the security proxy.
     >>> from lp.registry.model.product import Product
-    >>> Product.byName('bazaar').official_rosetta = False
+    >>> product = Product.byName('bazaar')
+    >>> product.translations_usage = ServiceUsage.NOT_APPLICABLE
 
 When the owner now visits the upload page for trunk, there's a notice.
 

=== modified file 'lib/lp/translations/stories/standalone/custom-language-codes.txt'
--- lib/lp/translations/stories/standalone/custom-language-codes.txt	2010-03-11 20:54:36 +0000
+++ lib/lp/translations/stories/standalone/custom-language-codes.txt	2010-09-09 15:34:46 +0000
@@ -11,11 +11,11 @@
 Custom language codes are attached to either a product or a source
 package.
 
-    >>> import re
     >>> from zope.component import getUtility
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
+    >>> from lp.app.enums import ServiceUsage
 
     >>> def find_custom_language_codes_link(browser):
     ...     """Find reference to custom language codes on a page."""
@@ -29,7 +29,8 @@
     ...     getUtility(ILaunchpadCelebrities).rosetta_experts)
     >>> product = factory.makeProduct(displayname="Foo", owner=owner)
     >>> trunk = product.getSeries('trunk')
-    >>> removeSecurityProxy(product).official_rosetta = True
+    >>> naked_product = removeSecurityProxy(product)
+    >>> naked_product.translations_usage = ServiceUsage.LAUNCHPAD
     >>> template = factory.makePOTemplate(productseries=trunk)
     >>> product_page = canonical_url(product, rootsite='translations')
     >>> logout()
@@ -198,7 +199,8 @@
     >>> sourcepackagename = SourcePackageName(name='bar')
     >>> package = factory.makeSourcePackage(
     ...     sourcepackagename=sourcepackagename, distroseries=distroseries)
-    >>> removeSecurityProxy(distro).official_rosetta = True
+    >>> naked_distro = removeSecurityProxy(distro)
+    >>> naked_distro.translations_usage = ServiceUsage.LAUNCHPAD
     >>> other_series = factory.makeDistroRelease(distribution=distro)
     >>> template = factory.makePOTemplate(
     ...     distroseries=package.distroseries,

=== modified file 'lib/lp/translations/stories/standalone/xx-potemplate-index.txt'
--- lib/lp/translations/stories/standalone/xx-potemplate-index.txt	2010-02-16 21:21:14 +0000
+++ lib/lp/translations/stories/standalone/xx-potemplate-index.txt	2010-09-09 15:34:46 +0000
@@ -6,7 +6,7 @@
 -----------
 
 The index page for a POTemplate lists all available translations
-for a source package. No Privileges Person visits the 
+for a source package. No Privileges Person visits the
 evolution-2.2 POTemplate page.
 
     >>> anon_browser.open("http://translations.launchpad.dev/"
@@ -85,7 +85,7 @@
     </p>
 
 
-DistroSeries and ProductSeries links to related templates 
+DistroSeries and ProductSeries links to related templates
 ---------------------------------------------------------
 
 We are presented not only with links to alternate templates from the same
@@ -117,8 +117,8 @@
 A source package with five templates is created.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces.launchpad import (
-    ...     ILaunchpadCelebrities)
+    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+
     >>> login('[e-mail]')
     >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
     >>> hoary = ubuntu.getSeries('hoary')
@@ -212,8 +212,10 @@
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
+    >>> from lp.app.enums import ServiceUsage
     >>> login('[e-mail]')
-    >>> product = factory.makeProduct(name="fusa", official_rosetta=True)
+    >>> product = factory.makeProduct(name="fusa",
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> product_trunk = product.getSeries('trunk')
     >>> template = factory.makePOTemplate(
     ...     productseries=product_trunk, name='first')
@@ -253,7 +255,9 @@
 Anonymous visitors see only a list of all existing templates, with no
 administration or download/upload links.
 
-    >>> anon_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> anon_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> anon_browser.getLink('upload')
     Traceback (most recent call last):
     ...
@@ -267,7 +271,9 @@
 As an authenticated user, you should see the download link,
 but not the one for uploading file to this potemplate.
 
-    >>> user_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> user_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> user_browser.getLink('upload')
     Traceback (most recent call last):
     ...
@@ -281,27 +287,37 @@
 Beside administering this template, "Change permissions"
 and "Change details" should be also accessible.
 
-    >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> admin_browser.getLink('upload').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/+upload
 
-    >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> admin_browser.getLink('download').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/+export
 
-    >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> admin_browser.getLink('Administer this template').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/+admin
 
-    >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> admin_browser.getLink('Change details').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/+edit
 
-    >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/'
+    ...     'ubuntu/hoary/+source/evolution/+pots/evolution-2.2')
     >>> admin_browser.getLink('Change permissions').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/+settings

=== modified file 'lib/lp/translations/stories/standalone/xx-product-export.txt'
--- lib/lp/translations/stories/standalone/xx-product-export.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/translations/stories/standalone/xx-product-export.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,5 @@
-= Downloading Product Series Translations =
+Downloading Product Series Translations
+=======================================
 
 Products and product series that use Translations offer complete
 translation downloads.
@@ -33,16 +34,18 @@
     Your request has been received.  Expect to receive an email shortly.
 
 
-== Use of Launchpad Translations ==
+Use of Launchpad Translations
+-----------------------------
 
 The Download link is not shown if the product does not use Launchpad
 Translations.
 
     # Use the DB classes directly to avoid having to setup a zope interaction
     # (i.e. login()) and bypass the security proxy.
+    >>> from lp.app.enums import ServiceUsage
     >>> from lp.registry.model.product import Product
     >>> product = Product.byName('evolution')
-    >>> product.official_rosetta = False
+    >>> product.translations_usage = ServiceUsage.NOT_APPLICABLE
     >>> product.sync()
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
     >>> user_browser.getLink('download')
@@ -51,14 +54,15 @@
     LinkNotFoundError
 
     >>> # Restore previous state for subsequent tests, and verify
-    >>> product.official_rosetta = True
+    >>> product.translations_usage = ServiceUsage.LAUNCHPAD
     >>> product.sync()
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
     >>> user_browser.getLink('download') is not None
     True
 
 
-== Authorization ==
+Authorization
+-------------
 
 Only logged-in users get the option to request downloads.
 

=== modified file 'lib/lp/translations/stories/standalone/xx-product-translations.txt'
--- lib/lp/translations/stories/standalone/xx-product-translations.txt	2010-08-25 00:01:57 +0000
+++ lib/lp/translations/stories/standalone/xx-product-translations.txt	2010-09-09 15:34:46 +0000
@@ -1,4 +1,3 @@
-====================
 Product Translations
 ====================
 

=== modified file 'lib/lp/translations/stories/standalone/xx-template-description-escaping.txt'
--- lib/lp/translations/stories/standalone/xx-template-description-escaping.txt	2009-09-14 15:41:21 +0000
+++ lib/lp/translations/stories/standalone/xx-template-description-escaping.txt	2010-09-09 15:34:46 +0000
@@ -1,12 +1,14 @@
     >>> import re
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.app.enums import ServiceUsage
 
     >>> login('[e-mail]')
     >>> package = factory.makeSourcePackage()
     >>> template = removeSecurityProxy(factory.makePOTemplate(
     ...     distroseries=package.distroseries,
     ...     sourcepackagename=package.sourcepackagename))
-    >>> template.distroseries.distribution.official_rosetta = True
+    >>> distribution = template.distroseries.distribution
+    >>> distribution.translations_usage = ServiceUsage.LAUNCHPAD
     >>> template.distroseries.hide_all_translations = False
     >>> template.description = "See http://example.com/ for an example!"
     >>> package_url = canonical_url(package, rootsite='translations')

=== modified file 'lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt'
--- lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	2010-01-20 20:21:42 +0000
+++ lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	2010-09-09 15:34:46 +0000
@@ -1,9 +1,10 @@
 The translation focus of a product can be explicitly set to a specific series.
 When not set, launchpad recommends the development focus to translate.
 
+    >>> from lp.app.enums import ServiceUsage
     >>> login('[e-mail]')
     >>> fooproject = factory.makeProduct(name="fooproject")
-    >>> fooproject.official_rosetta = True
+    >>> fooproject.translations_usage = ServiceUsage.LAUNCHPAD
     >>> fooproject_trunk = fooproject.getSeries("trunk")
     >>> fooproject_url = canonical_url(
     ...     fooproject, rootsite="translations")
@@ -25,7 +26,8 @@
     ...
     IndexError: list index out of range
 
-== Setting the translation focus ==
+Setting the translation focus
+=============================
 
     >>> login('[e-mail]')
     >>> from zope.security.proxy import removeSecurityProxy
@@ -35,7 +37,7 @@
     >>> pofile = factory.makePOFile("pt_BR", potemplate=pot_main)
     >>> logout()
 
-When the translation focus is not set, Launchpad suggests the 
+When the translation focus is not set, Launchpad suggests the
 development focus as the current series to be translated.
 It needs to be translatable.
 

=== modified file 'lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt'
--- lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt	2010-02-16 21:21:14 +0000
+++ lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt	2010-09-09 15:34:46 +0000
@@ -4,11 +4,15 @@
 A product owner, Rosetta expert, and Ubuntu translations coordinator
 browser is created.
 
+    >>> from lp.app.enums import ServiceUsage
+
     >>> login('[e-mail]')
     >>> product_owner = factory.makePerson(
     ...     email="[e-mail]", password="test")
     >>> chestii = factory.makeProduct(
-    ...     name='chestii', owner=product_owner, official_rosetta=True)
+    ...     name='chestii',
+    ...     owner=product_owner,
+    ...     translations_usage=ServiceUsage.LAUNCHPAD)
     >>> logout()
     >>> dtc_browser = setupDTCBrowser()
     >>> re_browser = setupRosettaExpertBrowser()

=== modified file 'lib/lp/translations/templates/product-portlet-not-using-launchpad.pt'
--- lib/lp/translations/templates/product-portlet-not-using-launchpad.pt	2010-03-15 20:17:21 +0000
+++ lib/lp/translations/templates/product-portlet-not-using-launchpad.pt	2010-09-09 15:34:46 +0000
@@ -5,7 +5,7 @@
   omit-tag="">
 
     <div id="not-translated-in-launchpad"
-         tal:condition="not: context/official_rosetta">
+         tal:condition="not: context/translations_usage/enumvalue:LAUNCHPAD">
       <strong>
         This project is not using Launchpad for translations.
       </strong>

=== modified file 'lib/lp/translations/templates/productseries-translations.pt'
--- lib/lp/translations/templates/productseries-translations.pt	2009-12-16 15:21:36 +0000
+++ lib/lp/translations/templates/productseries-translations.pt	2010-09-09 15:34:46 +0000
@@ -30,7 +30,7 @@
           <a href="https://help.launchpad.net/Translations/YourProject">start
             translating your project</a>,
           <tal:uses-translations condition="not:
-                                            context/product/official_rosetta">
+                    context/product/translations_usage/enumvalue:LAUNCHPAD">
             you should enable translations in your project settings, and
           </tal:uses-translations>
           you can either

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2010-09-09 15:34:46 +0000
@@ -23,6 +23,7 @@
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 from canonical.launchpad.webapp.testing import verifyObject
 from canonical.testing import LaunchpadZopelessLayer
+from lp.app.enums import ServiceUsage
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.model.distribution import Distribution
 from lp.registry.model.sourcepackagename import (
@@ -714,8 +715,8 @@
         # _get_pofile_from_language will find an enabled template, and
         # return either an existing POFile for the given language, or a
         # newly created one.
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         trunk = product.getSeries('trunk')
         template = self.factory.makePOTemplate(
             productseries=trunk, translation_domain='domain')
@@ -732,8 +733,8 @@
         # _get_pofile_from_language will not consider a disabled
         # template as an auto-approval target, and so will not return a
         # POFile for it.
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         trunk = product.getSeries('trunk')
         template = self.factory.makePOTemplate(
             productseries=trunk, translation_domain='domain')
@@ -750,8 +751,8 @@
         # When the template has translation credits, a new dummy translation
         # is created in the new POFile. Since this is running with gardener
         # privileges, we need to check that this works, too.
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         trunk = product.getSeries('trunk')
         template = self.factory.makePOTemplate(
             productseries=trunk, translation_domain='domain')
@@ -778,8 +779,8 @@
 
     def _makeProductEntry(self, path='foo.pot', status=None):
         """Simulate upload for a product."""
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         trunk = product.getSeries('trunk')
         entry = self.queue.addOrUpdateEntry(
             path, '# contents', False, product.owner, productseries=trunk)

=== modified file 'lib/lp/translations/tests/test_empty_messages.py'
--- lib/lp/translations/tests/test_empty_messages.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_empty_messages.py	2010-09-09 15:34:46 +0000
@@ -4,17 +4,17 @@
 __metaclass__ = type
 
 from datetime import datetime
-import unittest
 
 from pytz import timezone
 from zope.component import getUtility
 
 from canonical.testing import LaunchpadZopelessLayer
+from lp.app.enums import ServiceUsage
 from lp.services.worlddata.interfaces.language import ILanguageSet
-from lp.testing.factory import LaunchpadObjectFactory
-
-
-class TestTranslationEmptyMessages(unittest.TestCase):
+from lp.testing import TestCaseWithFactory
+
+
+class TestTranslationEmptyMessages(TestCaseWithFactory):
     """Test behaviour of empty translation messages."""
 
     layer = LaunchpadZopelessLayer
@@ -23,13 +23,15 @@
         """Set up context to test in."""
         # Pretend we have a product being translated to Serbian.
         # This is where we are going to be importing translations to.
-        factory = LaunchpadObjectFactory()
-        self.factory = factory
-        self.productseries = factory.makeProductSeries()
-        self.productseries.product.official_rosetta = True
-        self.potemplate = factory.makePOTemplate(self.productseries)
+        super(TestTranslationEmptyMessages, self).setUp()
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
+        self.productseries = self.factory.makeProductSeries(product=product)
+        self.potemplate = self.factory.makePOTemplate(self.productseries)
         self.serbian = getUtility(ILanguageSet).getLanguageByCode('sr')
-        self.pofile_sr = factory.makePOFile('sr', potemplate=self.potemplate)
+        self.pofile_sr = self.factory.makePOFile(
+            'sr',
+            potemplate=self.potemplate)
         self.now = datetime.now(timezone('UTC'))
 
     def test_NoEmptyImporedTranslation(self):

=== modified file 'lib/lp/translations/tests/test_hastranslationtemplates.py'
--- lib/lp/translations/tests/test_hastranslationtemplates.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_hastranslationtemplates.py	2010-09-09 15:34:46 +0000
@@ -6,6 +6,7 @@
 from zope.interface.verify import verifyObject
 
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.testing import TestCaseWithFactory
 from lp.translations.interfaces.potemplate import IHasTranslationTemplates
 from lp.translations.interfaces.translationfileformat import (
@@ -152,7 +153,7 @@
 
         # A product or distribution that doesn't use Launchpad for
         # translations has no current templates.
-        self.product_or_distro.official_rosetta = False
+        self.product_or_distro.translations_usage = ServiceUsage.EXTERNAL
         self.assertFalse(self.container.has_current_translation_templates)
 
     def test_getTranslationTemplateFormats(self):
@@ -205,7 +206,7 @@
         super(TestProductSeriesHasTranslationTemplates, self).setUp()
         self.container = self.factory.makeProductSeries()
         self.product_or_distro = self.container.product
-        self.product_or_distro.official_rosetta = True
+        self.product_or_distro.translations_usage = ServiceUsage.LAUNCHPAD
 
 
 class TestSourcePackageHasTranslationTemplates(
@@ -223,7 +224,7 @@
         super(TestSourcePackageHasTranslationTemplates, self).setUp()
         self.container = self.factory.makeSourcePackage()
         self.product_or_distro = self.container.distroseries.distribution
-        self.product_or_distro.official_rosetta = True
+        self.product_or_distro.translations_usage = ServiceUsage.LAUNCHPAD
 
 
 class TestDistroSeriesHasTranslationTemplates(
@@ -243,4 +244,4 @@
         super(TestDistroSeriesHasTranslationTemplates, self).setUp()
         self.container = self.factory.makeDistroRelease()
         self.product_or_distro = self.container.distribution
-        self.product_or_distro.official_rosetta = True
+        self.product_or_distro.translations_usage = ServiceUsage.LAUNCHPAD

=== modified file 'lib/lp/translations/tests/test_pofile.py'
--- lib/lp/translations/tests/test_pofile.py	2010-09-03 14:38:20 +0000
+++ lib/lp/translations/tests/test_pofile.py	2010-09-09 15:34:46 +0000
@@ -24,6 +24,7 @@
     LaunchpadZopelessLayer,
     ZopelessDatabaseLayer,
     )
+from lp.app.enums import ServiceUsage
 from lp.testing import TestCaseWithFactory
 from lp.translations.interfaces.pofile import IPOFileSet
 from lp.translations.interfaces.translatablemessage import (
@@ -46,12 +47,13 @@
         # Create a product with two series and a shared POTemplate
         # in different series ('devel' and 'stable').
         super(TestTranslationSharedPOFile, self).setUp()
-        self.foo = self.factory.makeProduct(name='foo')
+        self.foo = self.factory.makeProduct(
+            name='foo',
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_devel = self.factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = self.factory.makeProductSeries(
             name='stable', product=self.foo)
-        self.foo.official_rosetta = True
 
         # POTemplate is 'shared' if it has the same name ('messages').
         self.devel_potemplate = self.factory.makePOTemplate(
@@ -76,7 +78,8 @@
             'http://translations.launchpad.dev/foo/devel/+pots/messages/sr',
             canonical_url(self.devel_sr_pofile))
         self.assertEqual(
-            'http://translations.launchpad.dev/foo/devel/+pots/messages/sr/+details',
+            ('http://translations.launchpad.dev/'
+            'foo/devel/+pots/messages/sr/+details'),
             canonical_url(self.devel_sr_pofile, view_name="+details"))
 
     def test_findPOTMsgSetsContaining(self):
@@ -879,12 +882,12 @@
         # Create a product with two series and a shared POTemplate
         # in different series ('devel' and 'stable').
         super(TestSharedPOFileCreation, self).setUp()
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_devel = self.factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = self.factory.makeProductSeries(
             name='stable', product=self.foo)
-        self.foo.official_rosetta = True
 
     def test_pofile_creation_shared(self):
         # When a pofile is created in a POTemplate it is also created in
@@ -1009,12 +1012,12 @@
         # Create a product with two series and a shared POTemplate
         # in different series ('devel' and 'stable').
         super(TestTranslationPOFilePOTMsgSetOrdering, self).setUp()
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_devel = self.factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = self.factory.makeProductSeries(
             name='stable', product=self.foo)
-        self.foo.official_rosetta = True
 
         # POTemplate is 'shared' if it has the same name ('messages').
         self.devel_potemplate = self.factory.makePOTemplate(
@@ -1288,8 +1291,8 @@
         # We create a product with two series, and attach
         # a POTemplate and Serbian POFile to each, making
         # sure they share translations (potemplates have the same name).
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         series1 = self.factory.makeProductSeries(product=product,
                                                  name='one')
         series2 = self.factory.makeProductSeries(product=product,
@@ -1324,8 +1327,8 @@
         # This is a test for bug #414832 which caused sharing POFiles
         # of the touched POFile not to be returned if they had
         # IDs smaller than the touched POFile.
-        product = self.factory.makeProduct()
-        product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         series1 = self.factory.makeProductSeries(product=product,
                                                  name='one')
         series2 = self.factory.makeProductSeries(product=product,
@@ -1357,7 +1360,7 @@
         # POFile to each, making sure they share translations
         # (potemplates have the same name).
         distro = self.factory.makeDistribution()
-        distro.official_rosetta = True
+        distro.translations_usage = ServiceUsage.LAUNCHPAD
         series1 = self.factory.makeDistroRelease(distribution=distro,
                                                  name='one')
         sourcepackagename = self.factory.makeSourcePackageName()
@@ -1395,9 +1398,9 @@
         # Make sure POFiles which are in different products
         # are not returned even though they have the same potemplate name.
         series1 = self.factory.makeProductSeries(name='one')
-        series1.product.official_rosetta = True
+        series1.product.translations_usage = ServiceUsage.LAUNCHPAD
         series2 = self.factory.makeProductSeries(name='two')
-        series2.product.official_rosetta = True
+        series1.product.translations_usage = ServiceUsage.LAUNCHPAD
         self.assertNotEqual(series1.product, series2.product)
 
         potemplate1 = self.factory.makePOTemplate(name='shared',

=== modified file 'lib/lp/translations/tests/test_potemplate.py'
--- lib/lp/translations/tests/test_potemplate.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_potemplate.py	2010-09-09 15:34:46 +0000
@@ -7,6 +7,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import DatabaseFunctionalLayer
+from lp.app.enums import ServiceUsage
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing import TestCaseWithFactory
@@ -327,8 +328,8 @@
 
     def setUp(self):
         super(TestTemplatePrecedence, self).setUp(user='[e-mail]')
-        self.product = self.factory.makeProduct()
-        self.product.official_rosetta = True
+        self.product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.trunk = self.product.getSeries('trunk')
         self.one_dot_oh = self.factory.makeProductSeries(
             product=self.product, name='one')

=== modified file 'lib/lp/translations/tests/test_potmsgset.py'
--- lib/lp/translations/tests/test_potmsgset.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_potmsgset.py	2010-09-09 15:34:46 +0000
@@ -20,6 +20,7 @@
 
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProductSet
 from lp.services.worlddata.interfaces.language import ILanguageSet
@@ -45,12 +46,12 @@
         # Create a product with two series and a shared POTemplate
         # in different series ('devel' and 'stable').
         super(TestTranslationSharedPOTMsgSets, self).setUp()
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_devel = self.factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = self.factory.makeProductSeries(
             name='stable', product=self.foo)
-        self.foo.official_rosetta = True
 
         # POTemplate is 'shared' if it has the same name ('messages').
         self.devel_potemplate = self.factory.makePOTemplate(
@@ -324,7 +325,8 @@
         # Create an external POTemplate with a POTMsgSet using
         # the same English string as the one in self.potmsgset.
         external_template = self.factory.makePOTemplate()
-        external_template.productseries.product.official_rosetta = True
+        product = external_template.productseries.product
+        product.translations_usage = ServiceUsage.LAUNCHPAD
         external_potmsgset = self.factory.makePOTMsgSet(
             external_template,
             singular=self.potmsgset.singular_text)
@@ -383,7 +385,8 @@
         # Create an external POTemplate with a POTMsgSet using
         # the same English string as the one in self.potmsgset.
         external_template = self.factory.makePOTemplate()
-        external_template.productseries.product.official_rosetta = True
+        product = external_template.productseries.product
+        product.translations_usage = ServiceUsage.LAUNCHPAD
         external_potmsgset = self.factory.makePOTMsgSet(
             external_template,
             singular=self.potmsgset.singular_text)
@@ -738,10 +741,10 @@
         # create TranslationMessage objects.
         super(TestPOTMsgSetSuggestions, self).setUp()
         self.now = self.gen_now().next
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_main = self.factory.makeProductSeries(
             name='main', product=self.foo)
-        self.foo.official_rosetta = True
 
         self.potemplate = self.factory.makePOTemplate(
             productseries=self.foo_main, name="messages")
@@ -926,10 +929,10 @@
         # create TranslationMessage objects.
         super(TestPOTMsgSetResetTranslation, self).setUp()
         self.now = self.gen_now().next
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_main = self.factory.makeProductSeries(
             name='main', product=self.foo)
-        self.foo.official_rosetta = True
 
         self.potemplate = self.factory.makePOTemplate(
             productseries=self.foo_main, name="messages")

=== modified file 'lib/lp/translations/tests/test_productserieslanguage.py'
--- lib/lp/translations/tests/test_productserieslanguage.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_productserieslanguage.py	2010-09-09 15:34:46 +0000
@@ -10,6 +10,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing import TestCaseWithFactory
 from lp.translations.interfaces.productserieslanguage import (
@@ -26,8 +27,10 @@
     def setUp(self):
         # Create a productseries that uses translations.
         TestCaseWithFactory.setUp(self)
-        self.productseries = self.factory.makeProductSeries()
-        self.productseries.product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
+        self.productseries = self.factory.makeProductSeries(
+            product=product)
 
     def test_no_templates_no_translation(self):
         # There are no templates and no translations.
@@ -125,8 +128,10 @@
     def setUp(self):
         # Create a productseries that uses translations.
         TestCaseWithFactory.setUp(self)
-        self.productseries = self.factory.makeProductSeries()
-        self.productseries.product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
+        self.productseries = self.factory.makeProductSeries(
+            product=product)
         self.psl_set = getUtility(IProductSeriesLanguageSet)
         self.language = getUtility(ILanguageSet).getLanguageByCode('sr')
 

=== modified file 'lib/lp/translations/tests/test_shared_potemplate.py'
--- lib/lp/translations/tests/test_shared_potemplate.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_shared_potemplate.py	2010-09-09 15:34:46 +0000
@@ -10,6 +10,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.testing.factory import LaunchpadObjectFactory
 
 
@@ -24,12 +25,12 @@
         # in different series ('devel' and 'stable').
         factory = LaunchpadObjectFactory()
         self.factory = factory
-        self.foo = factory.makeProduct()
+        self.foo = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.foo_devel = factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = factory.makeProductSeries(
             name='stable', product=self.foo)
-        self.foo.official_rosetta = True
 
         # POTemplate is a 'sharing' one if it has the same name ('messages').
         self.devel_potemplate = factory.makePOTemplate(

=== modified file 'lib/lp/translations/tests/test_suggestions.py'
--- lib/lp/translations/tests/test_suggestions.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_suggestions.py	2010-09-09 15:34:46 +0000
@@ -17,6 +17,7 @@
 
 from canonical.config import config
 from canonical.testing import LaunchpadZopelessLayer
+from lp.app.enums import ServiceUsage
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing.factory import LaunchpadObjectFactory
 from lp.translations.interfaces.translationmessage import (
@@ -36,10 +37,14 @@
         # suggestions for the other.
         factory = LaunchpadObjectFactory()
         self.factory = factory
-        self.foo_trunk = factory.makeProductSeries()
-        self.bar_trunk = factory.makeProductSeries()
-        self.foo_trunk.product.official_rosetta = True
-        self.bar_trunk.product.official_rosetta = True
+        foo_product = factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
+        bar_product = factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
+        self.foo_trunk = factory.makeProductSeries(
+            product=foo_product)
+        self.bar_trunk = factory.makeProductSeries(
+            product=bar_product)
         self.foo_template = factory.makePOTemplate(self.foo_trunk)
         self.bar_template = factory.makePOTemplate(self.bar_trunk)
         self.nl = getUtility(ILanguageSet).getLanguageByCode('nl')
@@ -222,5 +227,6 @@
                           "TranslationMessage with errors is not correctly"
                           "marked as such in the database.")
 
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/translations/tests/test_translatablemessage.py'
--- lib/lp/translations/tests/test_translatablemessage.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translatablemessage.py	2010-09-09 15:34:46 +0000
@@ -15,6 +15,7 @@
 import transaction
 
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.testing import TestCaseWithFactory
 from lp.translations.model.translatablemessage import TranslatableMessage
 
@@ -31,8 +32,8 @@
         `POTMsgSet`, as well as a Esperanto translation.
         """
         super(TestTranslatableMessageBase, self).setUp()
-        self.product = self.factory.makeProduct()
-        self.product.official_rosetta = True
+        self.product = self.factory.makeProduct(
+            translations_usage=ServiceUsage.LAUNCHPAD)
         self.trunk = self.product.getSeries('trunk')
         self.potemplate = self.factory.makePOTemplate(
             productseries=self.trunk)
@@ -137,7 +138,8 @@
         super(TestTranslatableMessageExternal, self).setUp()
         common_msgid = self.potmsgset.singular_text
         self.external_potemplate = self.factory.makePOTemplate()
-        self.external_potemplate.productseries.product.official_rosetta = True
+        product = self.external_potemplate.productseries.product
+        product.translations_usage = ServiceUsage.LAUNCHPAD
         self.external_potmsgset = self.factory.makePOTMsgSet(
             potemplate=self.external_potemplate,
             singular=common_msgid, sequence=1)
@@ -175,24 +177,24 @@
         super(TestTranslatableMessageSuggestions, self).setUp()
         self.now = self.gen_now().next
         self.suggestion1 = self._createTranslation(date_updated=self.now())
-        self.current =  self._createTranslation(is_current=True,
+        self.current = self._createTranslation(is_current=True,
                                                 date_updated=self.now())
         self.suggestion2 = self._createTranslation(date_updated=self.now())
         self.message = TranslatableMessage(self.potmsgset, self.pofile)
 
     def test_getAllSuggestions(self):
-        # There are three different methods to return 
+        # There are three different methods to return
         suggestions = self.message.getAllSuggestions()
         self.assertContentEqual([self.suggestion1, self.suggestion2],
                                 suggestions)
 
     def test_getDismissedSuggestions(self):
-        # There are three different methods to return 
+        # There are three different methods to return
         suggestions = self.message.getDismissedSuggestions()
         self.assertContentEqual([self.suggestion1], suggestions)
 
     def test_getUnreviewedSuggestions(self):
-        # There are three different methods to return 
+        # There are three different methods to return
         suggestions = self.message.getUnreviewedSuggestions()
         self.assertContentEqual([self.suggestion2], suggestions)
 

=== modified file 'lib/lp/translations/tests/test_translatedlanguage.py'
--- lib/lp/translations/tests/test_translatedlanguage.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translatedlanguage.py	2010-09-09 15:34:46 +0000
@@ -8,6 +8,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import ZopelessDatabaseLayer
+from lp.app.enums import ServiceUsage
 from lp.testing import TestCaseWithFactory
 from lp.translations.interfaces.productserieslanguage import (
     IProductSeriesLanguageSet,
@@ -24,8 +25,10 @@
     def setUp(self):
         # Create a productseries that uses translations.
         TestCaseWithFactory.setUp(self)
-        self.productseries = self.factory.makeProductSeries()
-        self.productseries.product.official_rosetta = True
+        product = self.factory.makeProduct(
+            translations_usage = ServiceUsage.LAUNCHPAD)
+        self.productseries = self.factory.makeProductSeries(
+            product=product)
         self.parent = self.productseries
         self.psl_set = getUtility(IProductSeriesLanguageSet)
         self.language = self.factory.makeLanguage('sr@test')

=== modified file 'lib/lp/translations/tests/test_translations_to_review.py'
--- lib/lp/translations/tests/test_translations_to_review.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translations_to_review.py	2010-09-09 15:34:46 +0000
@@ -16,6 +16,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import DatabaseFunctionalLayer
+from lp.app.enums import ServiceUsage
 from lp.services.worlddata.model.language import LanguageSet
 from lp.testing import TestCaseWithFactory
 from lp.translations.interfaces.translationsperson import ITranslationsPerson
@@ -28,6 +29,7 @@
 
 class ReviewTestMixin:
     """Base for testing which translations a reviewer can review."""
+
     def setUpMixin(self, for_product=True):
         """Set up test environment.
 
@@ -68,7 +70,7 @@
         transaction.commit()
 
         self.supercontext.translationgroup = self.translationgroup
-        self.supercontext.official_rosetta = True
+        self.supercontext.translations_usage = ServiceUsage.LAUNCHPAD
 
         self.potemplate = self.factory.makePOTemplate(
             productseries=self.productseries, distroseries=self.distroseries,
@@ -111,6 +113,7 @@
 
     Can be applied to product or distribution setups.
     """
+
     def test_OneFileToReview(self):
         # In the base case, the method finds one POFile for self.person
         # to review.
@@ -131,7 +134,7 @@
     def test_getReviewableTranslationFiles_not_translating_in_launchpad(self):
         # We don't see products/distros that don't use Launchpad for
         # translations.
-        self.supercontext.official_rosetta = False
+        self.supercontext.translations_usage = ServiceUsage.NOT_APPLICABLE
         self.assertEqual(self._getReviewables(), [])
 
     def test_getReviewableTranslationFiles_non_reviewer(self):
@@ -200,7 +203,7 @@
         other_pofile = removeSecurityProxy(other_pofile)
 
         product = other_pofile.potemplate.productseries.product
-        product.official_rosetta = True
+        product.translations_usage = ServiceUsage.LAUNCHPAD
 
         if with_unreviewed:
             other_pofile.unreviewed_count = 1

=== modified file 'lib/lp/translations/windmill/tests/test_documentation_links.py'
--- lib/lp/translations/windmill/tests/test_documentation_links.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/windmill/tests/test_documentation_links.py	2010-09-09 15:34:46 +0000
@@ -9,6 +9,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.windmill.testing import lpuser
+from lp.app.enums import ServiceUsage
 from lp.testing import WindmillTestCase
 from lp.translations.windmill.testing import TranslationsWindmillLayer
 
@@ -52,7 +53,7 @@
         project = self.factory.makeProduct(
             name='test-product',
             displayname='Test Product',
-            official_rosetta=True)
+            translations_usage=ServiceUsage.LAUNCHPAD)
         removeSecurityProxy(project).translationgroup = group
 
         potemplate = self.createPOTemplateWithPOTMsgSets(

=== modified file 'lib/lp/translations/windmill/tests/test_import_queue.py'
--- lib/lp/translations/windmill/tests/test_import_queue.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/windmill/tests/test_import_queue.py	2010-09-09 15:34:46 +0000
@@ -8,7 +8,6 @@
 
 import transaction
 from zope.component import getUtility
-from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.windmill.testing import lpuser
@@ -18,6 +17,7 @@
     SLEEP,
     )
 from canonical.launchpad.windmill.testing.lpuser import login_person
+from lp.app.enums import ServiceUsage
 from lp.testing import WindmillTestCase
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue,
@@ -41,8 +41,8 @@
             'field.potemplate',
             'field.potemplate_name',
             'field.language',
-            ]
-    }
+            ],
+        }
     SELECT_FIELDS = [
         'field.potemplate',
         'field.language',
@@ -55,8 +55,7 @@
             input_tag = 'input'
         return (
             u"//tr[contains(@class,'unseen')]"
-            u"//%s[@id='%s']" % (input_tag, field_id)
-                )
+            u"//%s[@id='%s']" % (input_tag, field_id))
 
     def _assertAllFieldsVisible(self, client, fields):
         """Assert that all given fields are visible.
@@ -279,8 +278,9 @@
             name="hubert", displayname="Hubert Hunt", password="test",
             email="[e-mail]")
         # Create a project and an import entry with it.
-        product = self.factory.makeProduct(owner=hubert)
-        removeSecurityProxy(product).official_rosetta = True
+        product = self.factory.makeProduct(
+            owner=hubert,
+            translations_usage=ServiceUsage.LAUNCHPAD)
         productseries = product.getSeries('trunk')
         queue = getUtility(ITranslationImportQueue)
         potemplate = self.factory.makePOTemplate(productseries=productseries)