Merge lp:~adiroiban/launchpad/bug-127171 into lp:launchpad

[Adi Roiban]

+changetranslators becomes +settings, and rosetta admins can access it.

[Adi Roiban (adiroiban)]

= Bug 127171 =

A Translations Expert (or Rosetta Admin, or the other way around) cannot access the "Change translators" page.

For example, if he/she goes to: https://translations.launchpad.net/pmount/+translations, the Change translators option is shown, but clicking it result in:

  Not allowed here
  Sorry, you don't have permission to access this page.
  You are logged in as [...]

== Proposed fix ==

Allow Rosetta Admins to edit translation options for a project, a product and a distribution.

== Pre-implementation notes ==

After the fix for bug #422056 landed on edge, the Change translator page has been generalized and it does not include only option to change translations.
Talking with Danilo we decided to rename this page to +settings (see bug 516317).

Talking with Danilo, and as noted in the bug comments, Rosetta Experts should have access to both Product and Distribution settings. Translation group owners should not be able to edit project translation settings.

While Ubuntu is the only distribution using Launchpad Translations, the owners of a translation group will have access only to distributions (to help Ubuntu Translations Coordinators) not to projects using that translation group.

Talking with Jeroen, we decided to rename IHasTranslationGroup to ITranslationPolicy as it makes more sense.

== Implementation details ==
Since we are going to add more pagetests for Rosetta Experts, I have added setupRosettaExpertBrowser() to simplify such tests. I have also improved the previous code for creating a translation group owner browser.

The launchpad.TranslationAdmin permission was added for IProduct, IProject and IDistribution allowing Launchpad Admin, Rosetta Admins and owners to edit translation related attributes.

I did not touch the code popping in the lint warnings. Any advice for fixing them is much appreciated.

== Tests ==
lp-test -t permission -t policy

== Demo and Q/A ==
Log in as Rosetta admin (ex <email address hidden>).

Go to a product or project translations page:
ie. https://translations.launchpad.dev/evolution
https://translations.launchpad.dev/gnome

You should see the „Change permissions” link, be able to access the page and change the values from that page.

Same story for a distribution page:
https://translations.launchpad.dev/ubuntu

Login as a normal user you should not be able to see the link of edit the page.

= Launchpad lint =

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

Linting changed files:
  lib/canonical/launchpad/security.py
  lib/canonical/launchpad/testing/pages.py
  lib/lp/registry/configure.zcml
  lib/lp/registry/browser/product.py
  lib/lp/registry/interfaces/distribution.py
  lib/lp/registry/interfaces/product.py
  lib/lp/registry/interfaces/project.py
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/distribution.py
  lib/lp/translations/browser/potemplate.py
  lib/lp/translations/browser/product.py
  lib/lp/translations/browser/project.py
  lib/lp/translations/browser/translationgroup.py
  lib/lp/translations/interfaces/translationgroup.py
  lib/lp/translations/stories/translation...

[Jeroen T. Vermeulen (jtv)]

Fantastic branch and cover letter. Thanks for all the drive-by cleanups!

Don't worry about those lint reports; pylint gets confused sometimes.

I only have two very minor notes about the changes:

Line 410: I believe our policies nowadays for function, method, and class definitions with parameter lists that don't fit the line is to indent the next line to just behind the opening parenthesis. I hope the spacing comes across here, but:

{{{
409 +class IProject(IProjectPublic, IStructuralSubscriptionTarget,
410 + ITranslationPolicy):
}}}

...should be:

{{{
409 +class IProject(IProjectPublic, IStructuralSubscriptionTarget,
410 + ITranslationPolicy):
}}}

That is, ITranslationPolicy should be directly under IProjectPublic.

Line 551: When we wrap lists (of multiple items) to multiple lines, we keep the closing bracket on a line of its own. The last element in the list should have a trailing comma. So:

{{{
546 field_names = [
547 "translationgroup",
548 "translationpermission",
549 - "translation_focus"
550 - ]
551 + "translation_focus"]
}}}

...was actually correct apart from the missing comma. It should be:

{{{
546 field_names = [
547 "translationgroup",
548 "translationpermission",
549 - "translation_focus"
549 + "translation_focus",
550 ]
}}}

Very minor comments indeed, but I could think of nothing else. :-)

review: Approve (code)

[Adi Roiban (adiroiban)]

În data de Mi, 17-02-2010 la 09:18 +0000, Jeroen T. Vermeulen a scris:
> Review: Approve code
> Fantastic branch and cover letter. Thanks for all the drive-by cleanups!
>
> Don't worry about those lint reports; pylint gets confused sometimes.
>
> I only have two very minor notes about the changes:

I have fixed and pushed the formating problems.

Can you please put this branch on queue for ec2 testings?

Many thanks!

--
Adi Roiban

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-02-10 23:14:56 +0000
+++ lib/canonical/launchpad/security.py	2010-02-17 09:39:19 +0000
@@ -496,6 +496,21 @@
         return user.in_admin or user.in_rosetta_experts
 
 
+class AdminProjectTranslations(AuthorizationBase):
+    permission = 'launchpad.TranslationsAdmin'
+    usedfor = IProject
+
+    def checkAuthenticated(self, user):
+        """Is the user able to manage `IProject` translations settings?
+
+        Any Launchpad/Launchpad Translations administrator or owner is
+        able to change translation settings for a project.
+        """
+        return (user.isOwner(self.obj) or
+                user.in_rosetta_experts or
+                user.in_admin)
+
+
 class AdminProductTranslations(AuthorizationBase):
     permission = 'launchpad.TranslationsAdmin'
     usedfor = IProduct
@@ -1100,8 +1115,7 @@
     usedfor = ICodeImportMachine
 
 
-class AdminDistributionTranslations(OnlyRosettaExpertsAndAdmins,
-                                    EditDistributionByDistroOwnersOrAdmins):
+class AdminDistributionTranslations(AuthorizationBase):
     """Class for deciding who can administer distribution translations.
 
     This class is used for `launchpad.TranslationsAdmin` privilege on
@@ -1115,9 +1129,9 @@
     def checkAuthenticated(self, user):
         """Is the user able to manage `IDistribution` translations settings?
 
-        Any Launchpad/Launchpad Translations administrator or people allowed
-        to edit distribution details are able to change translation settings
-        for a distribution.
+        Any Launchpad/Launchpad Translations administrator, translation group
+        owner or a person allowed to edit distribution details is able to
+        change translations settings for a distribution.
         """
         # Translation group owner for a distribution is also a
         # translations administrator for it.
@@ -1125,10 +1139,9 @@
         if translation_group and user.inTeam(translation_group.owner):
             return True
         else:
-            return (
-                OnlyRosettaExpertsAndAdmins.checkAuthenticated(self, user) or
-                EditDistributionByDistroOwnersOrAdmins.checkAuthenticated(
-                    self, user))
+            return (user.in_rosetta_experts or
+                    EditDistributionByDistroOwnersOrAdmins(
+                        self.obj).checkAuthenticated(user))
 
 
 class AdminPOTemplateDetails(OnlyRosettaExpertsAndAdmins):
@@ -1319,6 +1332,7 @@
         """
         return self.obj.canEdit(user)
 
+
 class AdminTranslationImportQueue(OnlyRosettaExpertsAndAdmins):
     permission = 'launchpad.Admin'
     usedfor = ITranslationImportQueue

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2010-01-04 16:02:31 +0000
+++ lib/canonical/launchpad/testing/pages.py	2010-02-17 09:39:19 +0000
@@ -28,9 +28,11 @@
 from zope.component import getUtility
 from zope.testbrowser.testing import Browser
 from zope.testing import doctest
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.interfaces import (
-    IOAuthConsumerSet, OAUTH_REALM, ILaunchpadCelebrities)
+    IOAuthConsumerSet, OAUTH_REALM, ILaunchpadCelebrities,
+    TeamMembershipStatus)
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite, SpecialOutputChecker, strip_prefix)
 from canonical.launchpad.webapp import canonical_url
@@ -51,6 +53,7 @@
     sending both Basic Auth and cookie credentials raises an exception
     (Bug 39881).
     """
+
     def __init__(self, *args, **kw):
         if kw.get('debug'):
             self._debug = True
@@ -203,7 +206,9 @@
 
 def find_tags_by_class(content, class_, only_first=False):
     """Find and return one or more tags matching the given class(es)"""
+
     match_classes = set(class_.split())
+
     def class_matcher(value):
         if value is None:
             return False
@@ -263,6 +268,7 @@
     for message in get_feedback_messages(content):
         print message
 
+
 def print_table(content, columns=None, skip_rows=None, sep="\t"):
     """Given a <table> print the content of each row.
 
@@ -283,6 +289,7 @@
         if len(row_content) > 0:
             print sep.join(row_content)
 
+
 def print_radio_button_field(content, name):
     """Find the input called field.name, and print a friendly representation.
 
@@ -457,7 +464,7 @@
 
 def print_navigation_links(content):
     """Print navigation menu urls."""
-    navigation_links  = find_tag_by_id(content, 'navigation-tabs')
+    navigation_links = find_tag_by_id(content, 'navigation-tabs')
     if navigation_links is None:
         print "No navigation links"
         return
@@ -527,7 +534,7 @@
 
 def print_batch_header(soup):
     """Print the batch navigator header."""
-    navigation = soup.find('td', {'class' : 'batch-navigation-index'})
+    navigation = soup.find('td', {'class': 'batch-navigation-index'})
     print extract_text(navigation).encode('ASCII', 'backslashreplace')
 
 
@@ -669,18 +676,43 @@
     login('[e-mail]')
     try:
         dtg_member = LaunchpadObjectFactory().makePerson(
+            name='ubuntu-translations-coordinator',
             email="[e-mail]", password="test")
     except NameAlreadyTaken:
         # We have already created the translations coordinator
         pass
     else:
-        dtg = LaunchpadObjectFactory().makeTranslationGroup(owner=dtg_member)
+        dtg = LaunchpadObjectFactory().makeTranslationGroup(
+            name="ubuntu-translators",
+            title="Ubuntu Translators",
+            owner=dtg_member)
         ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
         ubuntu.translationgroup = dtg
     logout()
     return setupBrowser(auth='Basic [e-mail]:test')
 
 
+def setupRosettaExpertBrowser():
+    """Testbrowser configured for Rosetta Experts."""
+
+    login('[e-mail]')
+    try:
+        rosetta_expert = LaunchpadObjectFactory().makePerson(
+            name='rosetta-experts-member',
+            email='[e-mail]', password='test')
+    except NameAlreadyTaken:
+        # We have already created an Rosetta expert
+        pass
+    else:
+        rosetta_experts_team = removeSecurityProxy(getUtility(
+            ILaunchpadCelebrities).rosetta_experts)
+        rosetta_experts_team.addMember(
+            rosetta_expert, reviewer=rosetta_experts_team,
+            status=TeamMembershipStatus.ADMIN)
+    logout()
+    return setupBrowser(auth='Basic [e-mail]:test')
+
+
 def stop():
     # Temporarily restore the real stdout.
     old_stdout = sys.stdout
@@ -704,6 +736,7 @@
         'launchpad-library', '')
     test.globs['setupBrowser'] = setupBrowser
     test.globs['setupDTCBrowser'] = setupDTCBrowser
+    test.globs['setupRosettaExpertBrowser'] = setupRosettaExpertBrowser
     test.globs['browser'] = setupBrowser()
     test.globs['anon_browser'] = setupBrowser()
     test.globs['user_browser'] = setupBrowser(

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-01-21 02:16:15 +0000
+++ lib/lp/registry/browser/product.py	2010-02-17 09:39:19 +0000
@@ -174,6 +174,7 @@
     Requires the "product" attribute be set in the child
     classes' action handler.
     """
+
     def validate(self, data):
         """Validate 'licenses' and 'license_info'.
 
@@ -221,6 +222,7 @@
                 "Launchpad", config.canonical.noreply_from_address)
             license_titles = '\n'.join(
                 license.title for license in self.product.licenses)
+
             def indent(text):
                 text = '\n    '.join(line for line in text.split('\n'))
                 text = '    ' + text
@@ -524,7 +526,6 @@
         series_list.insert(0, self.product.development_focus)
         return series_list
 
-
     @property
     def sorted_series_list(self):
         """Return a sorted list of series.
@@ -986,6 +987,7 @@
     Replaces the use of a (series, release) tuple so that it can be more
     clearly addressed in the view class.
     """
+
     def __init__(self, series, release):
         self.series = series
         self.release = release
@@ -1197,6 +1199,7 @@
                     'for this project first.',
                     canonical_url(self.context, rootsite="bugs")))
 
+
 class ProductAdminView(ProductEditView, EditPrivateBugsMixin):
     label = "Administer project details"
     field_names = ["name", "owner", "active", "autoupdate", "private_bugs"]
@@ -1693,7 +1696,6 @@
     # StepView requires that its validate() method not be overridden, so make
     # sure this calls the right method.  validateStep() will call the license
     # validation code.
-
     def validate(self, data):
         """See `MultiStepView`."""
         StepView.validate(self, data)

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-02-16 20:36:48 +0000
+++ lib/lp/registry/configure.zcml	2010-02-17 09:39:19 +0000
@@ -273,9 +273,14 @@
             interface="canonical.launchpad.interfaces.IFAQCollection"/>
         <allow
             interface="canonical.launchpad.interfaces.IQuestionCollection"/>
+        <allow
+            interface="lp.translations.interfaces.translationgroup.ITranslationPolicy"/>
         <require
             permission="launchpad.Edit"
             set_schema="lp.registry.interfaces.project.IProjectPublic"/>
+        <require
+            permission="launchpad.TranslationsAdmin"
+            set_schema="lp.translations.interfaces.translationgroup.ITranslationPolicy"/>
 
         <!-- IStructuralSubscriptionTarget -->
 
@@ -1081,9 +1086,7 @@
                             redeemSubscriptionVoucher releaseroot
                             remote_product screenshotsurl
                             security_contact sourceforgeproject
-                            summary title translationgroup
-                            translationpermission translation_focus
-                            wikiurl"/>
+                            summary title wikiurl"/>
 
         <!-- mark 2006-04-10 I put "name" in the admin group because
                         with Bazaar now in place, lots of people can have personal
@@ -1100,6 +1103,12 @@
             permission="launchpad.Admin"
             set_attributes="name autoupdate registrant"/>
         <require
+            permission="launchpad.TranslationsAdmin"
+            set_attributes="
+                translation_focus
+                translationgroup
+                translationpermission"/>
+        <require
             permission="zope.Public"
             attributes="
                 qualifies_for_free_hosting"/>
@@ -1375,16 +1384,19 @@
             interface="lp.registry.interfaces.distribution.IDistributionDriverRestricted"/>
         <require
             permission="launchpad.Edit"
-            set_attributes="displayname title summary description
-            		    translation_focus translationgroup translationpermission
-                            driver members owner security_contact mirror_admin
-                            homepage_content icon logo mugshot enable_bug_expiration
-                            bug_reporting_guidelines official_blueprints
-                            official_malone official_rosetta official_answers
-                            official_bug_tags"/>
+            set_attributes="
+                displayname title summary description driver
+                members owner security_contact mirror_admin homepage_content
+                icon logo mugshot enable_bug_expiration
+                bug_reporting_guidelines official_blueprints official_malone
+                official_rosetta official_answers official_bug_tags"/>
         <require
             permission="launchpad.TranslationsAdmin"
-            set_attributes="language_pack_admin"/>
+            set_attributes="
+                language_pack_admin
+                translationgroup
+                translationpermission
+                translation_focus"/>
 
         <!-- IHasAliases -->
 

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2010-02-04 21:18:32 +0000
+++ lib/lp/registry/interfaces/distribution.py	2010-02-17 09:39:19 +0000
@@ -55,7 +55,7 @@
     ISpecificationTarget)
 from lp.blueprints.interfaces.sprint import IHasSprints
 from lp.translations.interfaces.translationgroup import (
-    IHasTranslationGroup)
+    ITranslationPolicy)
 from canonical.launchpad.webapp.interfaces import NameLookupFailed
 from canonical.launchpad.validators.name import name_validator
 from canonical.launchpad.fields import (
@@ -90,7 +90,7 @@
 class IDistributionPublic(
     IBugTarget, ICanGetMilestonesDirectly, IHasAppointedDriver,
     IHasBuildRecords, IHasDrivers, IHasMentoringOffers, IHasMilestones,
-    IHasOwner, IHasSecurityContact, IHasSprints, IHasTranslationGroup,
+    IHasOwner, IHasSecurityContact, IHasSprints, ITranslationPolicy,
     IKarmaContext, ILaunchpadUsage, IMakesAnnouncements,
     IOfficialBugTagTargetPublic, IPillar, ISpecificationTarget):
     """Public IDistribution properties."""

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2010-01-20 13:58:45 +0000
+++ lib/lp/registry/interfaces/product.py	2010-02-17 09:39:19 +0000
@@ -49,7 +49,7 @@
 from lp.registry.interfaces.karma import IKarmaContext
 from canonical.launchpad.interfaces.launchpad import (
     IHasAppointedDriver, IHasDrivers, IHasExternalBugTracker, IHasIcon,
-    IHasLogo, IHasMugshot,IHasSecurityContact, ILaunchpadUsage)
+    IHasLogo, IHasMugshot, IHasSecurityContact, ILaunchpadUsage)
 from lp.registry.interfaces.role import IHasOwner
 from lp.registry.interfaces.milestone import (
     ICanGetMilestonesDirectly, IHasMilestones)
@@ -65,7 +65,7 @@
     ISpecificationTarget)
 from lp.blueprints.interfaces.sprint import IHasSprints
 from lp.translations.interfaces.translationgroup import (
-    IHasTranslationGroup)
+    ITranslationPolicy)
 from canonical.launchpad.validators import LaunchpadValidationError
 from canonical.launchpad.validators.name import name_validator
 from canonical.launchpad.webapp.interfaces import NameLookupFailed
@@ -179,8 +179,8 @@
         'ACADEMIC', 'APACHE', 'ARTISTIC', 'ARTISTIC_2_0',
         'BSD', 'COMMON_PUBLIC',
         'CC_BY', 'CC_BY_SA', 'CC_0', 'ECLIPSE',
-        'EDUCATIONAL_COMMUNITY', 'AFFERO', 'GNU_GPL_V2','GNU_GPL_V3',
-        'GNU_LGPL_V2_1','GNU_LGPL_V3', 'MIT', 'MPL', 'OPEN_SOFTWARE', 'PERL',
+        'EDUCATIONAL_COMMUNITY', 'AFFERO', 'GNU_GPL_V2', 'GNU_GPL_V3',
+        'GNU_LGPL_V2_1', 'GNU_LGPL_V3', 'MIT', 'MPL', 'OPEN_SOFTWARE', 'PERL',
         'PHP', 'PUBLIC_DOMAIN', 'PYTHON', 'ZPL',
         'DONT_KNOW', 'OTHER_PROPRIETARY', 'OTHER_OPEN_SOURCE')
 
@@ -338,7 +338,7 @@
     IHasBranchVisibilityPolicy, IHasDrivers, IHasExternalBugTracker, IHasIcon,
     IHasLogo, IHasMentoringOffers, IHasMergeProposals, IHasMilestones,
     IHasMugshot, IHasOwner, IHasSecurityContact, IHasSprints,
-    IHasTranslationGroup, IKarmaContext, ILaunchpadUsage, IMakesAnnouncements,
+    ITranslationPolicy, IKarmaContext, ILaunchpadUsage, IMakesAnnouncements,
     IOfficialBugTagTargetPublic, IPillar, ISpecificationTarget):
     """Public IProduct properties."""
 

=== modified file 'lib/lp/registry/interfaces/project.py'
--- lib/lp/registry/interfaces/project.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/interfaces/project.py	2010-02-17 09:39:19 +0000
@@ -38,7 +38,7 @@
     IHasSpecifications)
 from lp.blueprints.interfaces.sprint import IHasSprints
 from lp.translations.interfaces.translationgroup import (
-    IHasTranslationGroup)
+    ITranslationPolicy)
 from lp.registry.interfaces.structuralsubscription import (
     IStructuralSubscriptionTarget)
 from canonical.launchpad.validators.name import name_validator
@@ -63,8 +63,8 @@
     ICanGetMilestonesDirectly, IHasAppointedDriver, IHasBranches, IHasBugs,
     IHasDrivers, IHasBranchVisibilityPolicy, IHasIcon, IHasLogo,
     IHasMentoringOffers, IHasMergeProposals, IHasMilestones, IHasMugshot,
-    IHasOwner, IHasSpecifications, IHasSprints, IHasTranslationGroup,
-    IMakesAnnouncements, IKarmaContext, IPillar, IRootContext):
+    IHasOwner, IHasSpecifications, IHasSprints, IMakesAnnouncements,
+    IKarmaContext, IPillar, IRootContext):
     """Public IProject properties."""
 
     id = Int(title=_('ID'), readonly=True)
@@ -279,7 +279,8 @@
         """Return a ProjectSeries object with name `series_name`."""
 
 
-class IProject(IProjectPublic, IStructuralSubscriptionTarget):
+class IProject(IProjectPublic, IStructuralSubscriptionTarget,
+               ITranslationPolicy):
     """A Project."""
 
     export_as_webservice_entry('project_group')

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2010-02-10 13:04:10 +0000
+++ lib/lp/translations/browser/configure.zcml	2010-02-17 09:39:19 +0000
@@ -75,7 +75,7 @@
         template="../templates/translations-macros.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:page
-        for="lp.translations.interfaces.translationgroup.IHasTranslationGroup"
+        for="lp.translations.interfaces.translationgroup.ITranslationPolicy"
         facet="translations"
         permission="zope.Public"
         name="+portlet-translation-groups-and-permission"
@@ -800,10 +800,10 @@
         template="../templates/hastranslationimports-index.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:page
-        name="+changetranslators"
+        name="+settings"
         for="lp.registry.interfaces.product.IProduct"
-        class="lp.translations.browser.product.ProductChangeTranslatorsView"
-        permission="launchpad.Edit"
+        class="lp.translations.browser.product.ProductSettingsView"
+        permission="launchpad.TranslationsAdmin"
         template="../templates/set-translators.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:pages
@@ -853,10 +853,10 @@
         class="lp.translations.browser.translations.HelpTranslateButtonView"
         permission="zope.Public"/>
     <browser:page
-        name="+changetranslators"
+        name="+settings"
         for="lp.registry.interfaces.project.IProject"
-        class="lp.translations.browser.project.ProjectChangeTranslatorsView"
-        permission="launchpad.Edit"
+        class="lp.translations.browser.project.ProjectSettingsView"
+        permission="launchpad.TranslationsAdmin"
         template="../templates/set-translators.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
 
@@ -891,7 +891,7 @@
         name="+settings"
         for="lp.registry.interfaces.distribution.IDistribution"
         class="lp.translations.browser.distribution.DistributionSettingsView"
-        permission="launchpad.Edit"
+        permission="launchpad.TranslationsAdmin"
         template="../templates/set-translators.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:page

=== modified file 'lib/lp/translations/browser/distribution.py'
--- lib/lp/translations/browser/distribution.py	2009-12-13 11:55:40 +0000
+++ lib/lp/translations/browser/distribution.py	2010-02-17 09:39:19 +0000
@@ -35,10 +35,10 @@
         link = canonical_url(self.context, rootsite='translations')
         return Link(link, text)
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
-        text = 'Settings'
-        return Link('+settings', text)
+        text = 'Change permissions'
+        return Link('+settings', text, icon='edit')
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def language_pack_admin(self):
@@ -55,7 +55,6 @@
 
     schema = IDistribution
     label = "Select the language pack administrator"
-    page_title = "Set language pack administrator"
     field_names = ['language_pack_admin']
 
     @property
@@ -111,7 +110,6 @@
 
 class DistributionSettingsView(TranslationsMixin, DistributionEditView):
     label = "Set permissions and policies"
-    page_title = "Permissions and policies"
     field_names = ["translationgroup", "translationpermission"]
 
     @property

=== modified file 'lib/lp/translations/browser/potemplate.py'
--- lib/lp/translations/browser/potemplate.py	2010-02-01 19:19:32 +0000
+++ lib/lp/translations/browser/potemplate.py	2010-02-17 09:39:19 +0000
@@ -257,7 +257,7 @@
 
     @property
     def group_parent(self):
-        """Return a parent object implementing `IHasTranslationGroups`."""
+        """Return a parent object implementing `ITranslationPolicy`."""
         if self.context.productseries is not None:
             return self.context.productseries.product
         else:

=== modified file 'lib/lp/translations/browser/product.py'
--- lib/lp/translations/browser/product.py	2010-02-03 10:37:32 +0000
+++ lib/lp/translations/browser/product.py	2010-02-17 09:39:19 +0000
@@ -6,7 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
-    'ProductChangeTranslatorsView',
+    'ProductSettingsView',
     'ProductTranslationsMenu',
     'ProductView',
     ]
@@ -38,10 +38,10 @@
         text = 'Import queue'
         return Link('+imports', text)
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
-        text = 'Settings'
-        return Link('+changetranslators', text, icon='edit')
+        text = 'Change permissions'
+        return Link('+settings', text, icon='edit')
 
     @enabled_with_permission('launchpad.AnyPerson')
     def translationdownload(self):
@@ -62,13 +62,13 @@
         return Link(link, text, icon='translation')
 
 
-class ProductChangeTranslatorsView(TranslationsMixin, ProductEditView):
+class ProductSettingsView(TranslationsMixin, ProductEditView):
     label = "Set permissions and policies"
     page_title = "Permissions and policies"
     field_names = [
             "translationgroup",
             "translationpermission",
-            "translation_focus"
+            "translation_focus",
             ]
 
     @property

=== modified file 'lib/lp/translations/browser/project.py'
--- lib/lp/translations/browser/project.py	2009-09-17 12:45:52 +0000
+++ lib/lp/translations/browser/project.py	2010-02-17 09:39:19 +0000
@@ -6,7 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
-    'ProjectChangeTranslatorsView',
+    'ProjectSettingsView',
     'ProjectTranslationsMenu',
     'ProjectView',
     ]
@@ -25,10 +25,10 @@
     facet = 'translations'
     links = ['products', 'settings', 'overview']
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
-        text = 'Settings'
-        return Link('+changetranslators', text, icon='edit')
+        text = 'Change permissions'
+        return Link('+settings', text, icon='edit')
 
     def products(self):
         text = 'Products'
@@ -52,7 +52,7 @@
         return list(all_products - translatables)
 
 
-class ProjectChangeTranslatorsView(TranslationsMixin, ProjectEditView):
+class ProjectSettingsView(TranslationsMixin, ProjectEditView):
     label = "Set permissions and policies"
     page_title = "Permissions and policies"
     field_names = ["translationgroup", "translationpermission"]

=== modified file 'lib/lp/translations/browser/translationgroup.py'
--- lib/lp/translations/browser/translationgroup.py	2010-02-16 20:36:48 +0000
+++ lib/lp/translations/browser/translationgroup.py	2010-02-17 09:39:19 +0000
@@ -29,8 +29,7 @@
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from canonical.launchpad.webapp import (
     action, canonical_url, GetitemNavigation, LaunchpadEditFormView,
-    LaunchpadFormView
-    )
+    LaunchpadFormView)
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 
 
@@ -77,10 +76,10 @@
             result.append({'lang': item.language.englishname,
                            'person': item.translator,
                            'code': item.language.code,
-                           'language' : item.language,
+                           'language': item.language,
                            'datecreated': item.datecreated,
                            'style_guide_url': item.style_guide_url,
-                           'context' : item,
+                           'context': item,
                            })
         result.sort(key=operator.itemgetter('lang'))
         return result

=== modified file 'lib/lp/translations/interfaces/translationgroup.py'
--- lib/lp/translations/interfaces/translationgroup.py	2009-08-24 15:35:23 +0000
+++ lib/lp/translations/interfaces/translationgroup.py	2010-02-17 09:39:19 +0000
@@ -8,7 +8,7 @@
 __metaclass__ = type
 
 __all__ = [
-    'IHasTranslationGroup',
+    'ITranslationPolicy',
     'ITranslationGroup',
     'ITranslationGroupSet',
     'TranslationPermission',
@@ -74,7 +74,7 @@
         to add suggestions.""")
 
 
-class IHasTranslationGroup(Interface):
+class ITranslationPolicy(Interface):
     translationgroup = Choice(
         title = _("Translation group"),
         description = _("The translation group that helps review "

=== modified file 'lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt'
--- lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt	2009-09-12 07:25:21 +0000
+++ lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt	2010-02-17 09:39:19 +0000
@@ -29,7 +29,7 @@
 ... and its associated project, GNOME.
 
     >>> admin_browser.open(
-    ...     'http://translations.launchpad.dev/gnome/+changetranslators')
+    ...     'http://translations.launchpad.dev/gnome/+settings')
     >>> admin_browser.getControl('Translation group').displayValue = [
     ...     'Just a testing team']
     >>> admin_browser.getControl(

=== renamed file 'lib/lp/translations/stories/translationgroups/xx-product-translators.txt' => 'lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt'
--- lib/lp/translations/stories/translationgroups/xx-product-translators.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt	2010-02-17 09:39:19 +0000
@@ -1,13 +1,93 @@
-The translation work for a product can be assigned to a translation group.
-
-    >>> admin_browser.open(
-    ... 'http://translations.launchpad.dev/evolution/+changetranslators')
-    >>> print admin_browser.title
-    Permissions and policies...
-
-    >>> hint = find_tag_by_id(admin_browser.contents, 'form_extra_info')
-    >>> print hint
-    <p...
+Translations policy settings
+============================
+
+A product owner, Rosetta expert, and Ubuntu translations coordinator
+browser is created.
+
+    >>> login('[e-mail]')
+    >>> product_owner = factory.makePerson(
+    ...     email="[e-mail]", password="test")
+    >>> chestii = factory.makeProduct(
+    ...     name='chestii', owner=product_owner, official_rosetta=True)
+    >>> logout()
+    >>> dtc_browser = setupDTCBrowser()
+    >>> re_browser = setupRosettaExpertBrowser()
+    >>> po_browser = setupBrowser("Basic [e-mail]:test")
+
+Visiting the main products translations page, product owners and Rosetta
+administrators sees the "Change permissions" link, leading to the
+translations settings page.
+
+    >>> re_browser.open(
+    ...     'http://translations.launchpad.dev/chestii')
+    >>> re_browser.getLink('Change permissions').click()
+    >>> print re_browser.url
+    http://translations.launchpad.dev/chestii/+settings
+
+    >>> po_browser.open(
+    ...     'http://translations.launchpad.dev/chestii')
+    >>> po_browser.getLink('Change permissions').click()
+    >>> print po_browser.url
+    http://translations.launchpad.dev/chestii/+settings
+
+From the settings page, translations group and translation permissions
+can be changed.
+
+    >>> hint = find_tag_by_id(re_browser.contents, 'form_extra_info')
+    >>> print extract_text(hint)
     Select the translation group that will be managing...
-    ...The Evolution Groupware Application...
-    ...
+
+    >>> re_browser.getControl('Translation group').value = [
+    ...     'ubuntu-translators']
+    >>> re_browser.getControl('Translation permissions policy').value = [
+    ...     'CLOSED']
+    >>> re_browser.getControl('Change').click()
+    >>> print re_browser.url
+    http://translations.launchpad.dev/chestii
+    >>> permissions = find_tag_by_id(
+    ...     re_browser.contents, 'translation-permissions')
+    >>> print extract_text(permissions)
+    Chestii is translated by Ubuntu Translators with Closed permissions.
+
+Other persons, including the translation group owners, will not see the link
+to translations policy page.
+
+    >>> dtc_browser.open(
+    ...     'http://translations.launchpad.dev/chestii')
+    >>> dtc_browser.getLink('Change permissions')
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError...
+
+An attempt to access the translations policy url will not be authorized.
+
+    >>> browser.open(
+    ...     'http://translations.launchpad.dev/chestii/+settings')
+    Traceback (most recent call last):
+    ...
+    Unauthorized...
+
+
+Translations policy for distributions
+-------------------------------------
+
+Ubuntu translation coordinators will have access to translations policy page
+for Ubuntu and will be able to change it.
+
+    >>> dtc_browser.open(
+    ...     'http://translations.launchpad.dev/ubuntu')
+    >>> dtc_browser.getLink('Change permissions').click()
+    >>> print dtc_browser.url
+    http://translations.launchpad.dev/ubuntu/+settings
+
+    >>> dtc_browser.getControl('Translation group').value = [
+    ...     'ubuntu-translators']
+    >>> dtc_browser.getControl('Translation permissions policy').value = [
+    ...     'CLOSED']
+    >>> dtc_browser.getControl('Change').click()
+    >>> print dtc_browser.url
+    http://translations.launchpad.dev/ubuntu
+    >>> permissions = find_tag_by_id(
+    ...     dtc_browser.contents, 'translation-permissions')
+    >>> print extract_text(permissions)
+    Ubuntu is translated by Ubuntu Translators with Closed permissions.

=== modified file 'lib/lp/translations/templates/distribution-language-pack-admin-info.pt'
--- lib/lp/translations/templates/distribution-language-pack-admin-info.pt	2009-09-13 20:24:35 +0000
+++ lib/lp/translations/templates/distribution-language-pack-admin-info.pt	2010-02-17 09:39:19 +0000
@@ -11,7 +11,7 @@
                     >Mr. No
     </span>.
     <tal:admin
-       condition="context/required:launchpad.Edit">
+       condition="context/required:launchpad.TranslationsAdmin">
       <a tal:attributes="
            href
            context/fmt:url/+select-language-pack-admin"
@@ -19,7 +19,7 @@
     </tal:admin>
   </p>
   <tal:admin
-     condition="context/required:launchpad.Edit">
+     condition="context/required:launchpad.TranslationsAdmin">
     <p tal:condition="not:context/language_pack_admin">
       <a tal:attributes="
            href

=== modified file 'lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt'
--- lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt	2009-09-10 18:47:57 +0000
+++ lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt	2010-02-17 09:39:19 +0000
@@ -12,10 +12,9 @@
             tal:content="context/translationpermission/title">certain</a>
     permissions.
   </p>
-  <div tal:condition="context/required:launchpad.Edit">
-    <a class="edit sprite"
-       tal:define="link context/menu:navigation/settings"
-       tal:attributes="href link/url"
-       >Change permissions</a>
+  <div tal:condition="context/required:launchpad.TranslationsAdmin">
+    <a tal:replace="structure context/menu:translations/settings/fmt:link">
+      Change permissions
+    </a>
   </div>
 </div>