Merge lp:~henninge/launchpad/devel-487137-custom-language-codes into lp:launchpad

[Henning Eggers]

[r=jelmer][ui=sinzui][bug=487137] Let project owners and rosetta admins manage custom language codes. Mainly done by Adi.

= Summary =

This branch finishes off Adi's branch for the same bug which had
already been approved but was never landed. See the details here:
https://code.launchpad.net/~adiroiban/launchpad/bug-487137/+merge/23901

Also, the scope changed slightly because management of custom
language codes has now been extendended to project owners and
distribution translation teams respectively, so they can manage these
themselves. Great way to reduce the work load on admins and Launchapd
devs. ;-)

== Proposed fix ==

Remove AdminCustomLanguageCodes from security.py. This was the main
bug (and a good reason for not landing Adi's branch) as it shadowed
AdminProductTranslations and thus took this privilege away from
product owners. AdminProductTranslations is exactly what we need now
to allow access to owners & Rosetta admins.

Add AdminDistributionSourcePackageTranslations to grant
launchpad.TranslationsAdmin privileges on a DistributionSourcePackage
to the same persons that have it on the distribution.

Fix AdminCustomLanguageCode to allow access for owners and
distribution translation teams.

Update the page test to show the new behavior.

== Pre-implementation notes ==

I read through the previous mp and saw that it was well done. I did
some experiementing to figure out what was wrong with the branch and
found out about the shadowing issue. I talked to Danilo and we
decided to extendend privileges to project owners.

== Implementation details ==

AdminProductTranslations and AdminDistributionTranslations already do
the right thing and are used by the new adapters.
A custom language code can either be linked to a Product or a

DistributionSourcepackage (combination of distribution and
sourcepacakgename), so that the security adapter has to select the
right adapter to forward to.

AdminCustomLanguageCode already implemented forwarding via the
"distribution" attribute, so it could be used, too.

The test was re-written to use the owner_browser for all actions on a
Product. For the DistributionSourcePackage a translation group needed
to be added because its owner will have translation admin privileges
within the distribution. A new translations_browser was added for
this person.

== Tests ==

bin/test -vvcm lp.translations -t custom-language-codes.txt

== Demo and Q/A ==

On launchpad.dev login as <email address hidden> (name12) and go to this
page: https://translations.launchpad.dev/evolution
You should see the "define custom language codes" link.
Click on it and play around with the admin interface.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/translations/templates/sourcepackage-translations.pt
  lib/lp/translations/templates/customlanguagecode-remove.pt
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/customlanguagecode.py
  lib/canonical/launchpad/security.py
  lib/lp/translations/templates/customlanguagecodes-index.pt
  lib/lp/translations/templates/customlanguagecode-index.pt
  lib/lp/translations/stories/standalone/custom-language-codes.txt
  lib/lp/translations/templates/product-portlet-translatables.pt

[Henning Eggers (henninge)]

Here is the incremental diff in relation to Adi's branch. This MP is only
about these changes.

[Jelmer Vernooij (jelmer)]

review: Approve (code)

[Henning Eggers (henninge)]

I just realized that this branch needs a UI review, too. Here is a walk-through with some screen shots.

Starting on a product's translation page as the products owner. You see the link to "define custom languge codes".
http://people.canonical.com/~henninge/screenshots/custom_language_codes_1_product.png

Clicking that link will bring you to the listing of custom language codes for this product which is still empty.
http://people.canonical.com/~henninge/screenshots/custom_language_codes_2_index_empty.png

Clicking "Add a custom language code" will bring you to the add form.
http://people.canonical.com/~henninge/screenshots/custom_language_codes_3_add.png

Now the listing has one entry.
http://people.canonical.com/~henninge/screenshots/custom_language_codes_4_index_one.png

Clicking on the custom code brings up the details page for this code.
http://people.canonical.com/~henninge/screenshots/custom_language_codes_5_one.png

And trying to remove it will bring up the removal page.
http://people.canonical.com/~henninge/screenshots/custom_language_codes_6_remove.png

Almost could have done a screencast ... ;)

[Curtis Hovey (sinzui)]

Hi Henning.

This looks good. I have a question. Why is custom_language_codes_5_one.png missing a header? Maybe Custom language code 'qq' for Evolution?

review: Needs Information (ui)

[Henning Eggers (henninge)]

Good catch, thank you! Here is a screenshot of the fixed view.

http://people.canonical.com/~henninge/screenshots/custom_language_codes_5a_one.png

[Curtis Hovey (sinzui)]

I think this is good to land.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-12-17 20:28:40 +0000
+++ lib/canonical/launchpad/security.py	2010-12-23 09:44:44 +0000
@@ -183,6 +183,9 @@
     IPackageUploadQueue,
     )
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
+from lp.translations.interfaces.customlanguagecode import (
+    ICustomLanguageCode,
+    )
 from lp.translations.interfaces.languagepack import ILanguagePack
 from lp.translations.interfaces.pofile import IPOFile
 from lp.translations.interfaces.potemplate import IPOTemplate
@@ -740,6 +743,7 @@
 # with launchpad.View so that this adapter is used.  For now, though, it's
 # going to be used only on the webservice (which explicitly checks for
 # launchpad.View) so that we don't leak memberships of private teams.
+
 class ViewTeamMembership(AuthorizationBase):
     permission = 'launchpad.View'
     usedfor = ITeamMembership
@@ -1724,6 +1728,24 @@
     usedfor = ILanguage
 
 
+class AdminCustomLanguageCode(AuthorizationBase):
+    """Controls administration for a custom language code.
+
+    Whoever can admin a product's or distribution's translations can also
+    admin the custom language codes for it.
+    """
+    permission = 'launchpad.TranslationsAdmin'
+    usedfor = ICustomLanguageCode
+
+    def checkAuthenticated(self, user):
+        if self.obj.product is not None:
+            return AdminProductTranslations(
+                self.obj.product).checkAuthenticated(user)
+        else:
+            return AdminDistributionTranslations(
+                self.obj.distribution).checkAuthenticated(user)
+
+
 class AccessBranch(AuthorizationBase):
     """Controls visibility of branches.
 
@@ -1813,6 +1835,12 @@
             self.obj.distribution).checkAuthenticated(user))
 
 
+class AdminDistributionSourcePackageTranslations(
+    AdminDistroSeriesTranslations):
+    """DistributionSourcePackage objects link to a distribution, too."""
+    usedfor = IDistributionSourcePackage
+
+
 class AdminProductSeriesTranslations(AuthorizationBase):
     permission = 'launchpad.TranslationsAdmin'
     usedfor = IProductSeries

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2010-12-01 11:26:57 +0000
+++ lib/lp/translations/browser/configure.zcml	2010-12-23 09:44:44 +0000
@@ -941,7 +941,7 @@
         for="lp.registry.interfaces.distribution.IDistribution"
         permission="zope.Public"
         template="../templates/translations-portlet-not-using-launchpad-extra.pt"
-        layer="lp.translations.publisher.TranslationsLayer"/> 
+        layer="lp.translations.publisher.TranslationsLayer"/>
     <browser:page
         name="+portlet-configuration"
         for="lp.registry.interfaces.distribution.IDistribution"
@@ -1042,9 +1042,9 @@
     <browser:page
         name="+remove"
         for="lp.translations.interfaces.customlanguagecode.ICustomLanguageCode"
-        permission="launchpad.Admin"
+        permission="launchpad.TranslationsAdmin"
         class="lp.translations.browser.customlanguagecode.CustomLanguageCodeRemoveView"
-        template="../../app/templates/generic-edit.pt"
+        template="../templates/customlanguagecode-remove.pt"
         layer="lp.translations.publisher.TranslationsLayer"/>
 
 <!-- IHasCustomLanguageCodes -->
@@ -1062,7 +1062,7 @@
         layer="lp.translations.publisher.TranslationsLayer"
         class="lp.translations.browser.customlanguagecode.CustomLanguageCodeAddView"
         template="../templates/customlanguagecode-add.pt"
-        permission="launchpad.Admin"/>
+        permission="launchpad.TranslationsAdmin"/>
 
     </facet>
 

=== modified file 'lib/lp/translations/browser/customlanguagecode.py'
--- lib/lp/translations/browser/customlanguagecode.py	2010-12-01 11:26:57 +0000
+++ lib/lp/translations/browser/customlanguagecode.py	2010-12-23 09:44:44 +0000
@@ -11,7 +11,7 @@
     'CustomLanguageCodeView',
     'HasCustomLanguageCodesNavigation',
     'HasCustomLanguageCodesTraversalMixin',
-	]
+    ]
 
 
 import re
@@ -46,6 +46,7 @@
 
 class CustomLanguageCodeBreadcrumb(Breadcrumb):
     """Breadcrumb for a `CustomLanguageCode`."""
+
     @property
     def text(self):
         return smartquote(
@@ -126,6 +127,13 @@
 class CustomLanguageCodeView(LaunchpadView):
     schema = ICustomLanguageCode
 
+    @property
+    def label(self):
+        target_displayname = self.context.translation_target.displayname
+        return smartquote(
+            'Custom language code "%s" for %s' % (
+                self.context.language_code, target_displayname))
+
 
 class CustomLanguageCodeRemoveView(LaunchpadFormView):
     """View for removing a `CustomLanguageCode`."""
@@ -164,6 +172,7 @@
 class HasCustomLanguageCodesTraversalMixin:
     """Navigate from an `IHasCustomLanguageCodes` to a `CustomLanguageCode`.
     """
+
     @stepthrough('+customcode')
     def traverseCustomCode(self, name):
         """Traverse +customcode URLs."""

=== modified file 'lib/lp/translations/stories/standalone/custom-language-codes.txt'
--- lib/lp/translations/stories/standalone/custom-language-codes.txt	2010-08-31 23:03:45 +0000
+++ lib/lp/translations/stories/standalone/custom-language-codes.txt	2010-12-23 09:44:44 +0000
@@ -36,12 +36,22 @@
     >>> logout()
 
     >>> owner_browser = setupBrowser("Basic [e-mail]:test")
-
-An administrator sees the link to the custom language codes on a
-project's main translations page.
-
-    >>> admin_browser.open(product_page)
-    >>> tag = find_custom_language_codes_link(admin_browser)
+    >>> rosetta_admin_browser = setupRosettaExpertBrowser()
+
+The project's owner sees the link to the custom language codes on a project's
+main translations page.
+
+    >>> owner_browser.open(product_page)
+    >>> tag = find_custom_language_codes_link(owner_browser)
+    >>> print extract_text(tag.renderContents())
+    If necessary, you may
+    define custom language codes
+    for this project.
+
+Translation admins also have access to this link.
+
+    >>> rosetta_admin_browser.open(product_page)
+    >>> tag = find_custom_language_codes_link(rosetta_admin_browser)
     >>> print extract_text(tag.renderContents())
     If necessary, you may
     define custom language codes
@@ -49,39 +59,37 @@
 
 The link goes to the custom language codes management page.
 
-    >>> admin_browser.getLink("define custom language codes").click()
-    >>> custom_language_codes_page = admin_browser.url
-
-Non-admins, even the project's owner, don't see this link.  We do not
-advertise this feature, since the proper solution is generally to use
-the right language codes.
-
-    >>> owner_browser.open(product_page)
-    >>> print find_custom_language_codes_link(owner_browser)
+    >>> owner_browser.getLink("define custom language codes").click()
+    >>> custom_language_codes_page = owner_browser.url
+
+Other users don't see this link.
+
+    >>> user_browser.open(product_page)
+    >>> print find_custom_language_codes_link(user_browser)
     None
 
 Initially the page shows no custom language codes for the project.
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'empty')
+    >>> tag = find_tag_by_id(owner_browser.contents, 'empty')
     >>> print extract_text(tag.renderContents())
     No custom language codes have been defined.
 
-The admin can add a custom language code.
-
-    >>> admin_browser.getLink("Add a custom language code").click()
-    >>> add_page = admin_browser.url
-
-    >>> admin_browser.getControl("Language code:").value = 'no'
-    >>> admin_browser.getControl("Language:").value = ['nn']
-    >>> admin_browser.getControl("Add").click()
+There is a link to add a custom language code.
+
+    >>> owner_browser.getLink("Add a custom language code").click()
+    >>> add_page = owner_browser.url
+
+    >>> owner_browser.getControl("Language code:").value = 'no'
+    >>> owner_browser.getControl("Language:").value = ['nn']
+    >>> owner_browser.getControl("Add").click()
 
 This leads back to the custom language codes overview, where the new
 code is now shown.
 
-    >>> admin_browser.url == custom_language_codes_page
+    >>> owner_browser.url == custom_language_codes_page
     True
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'nonempty')
+    >>> tag = find_tag_by_id(owner_browser.contents, 'nonempty')
     >>> print extract_text(tag.renderContents())
     Foo uses the following custom language codes:
     Code...     ...maps to language
@@ -90,9 +98,10 @@
 There is an overview page for the custom code, though there's not much
 to see there.
 
-    >>> admin_browser.getLink("no").click()
-    >>> main = find_main_content(admin_browser.contents)
+    >>> owner_browser.getLink("no").click()
+    >>> main = find_main_content(owner_browser.contents)
     >>> print extract_text(main.renderContents())
+    Custom language code  ...no... for Foo
     Foo Translations Custom language code ...no...
     For Foo, uploads with the language code
     &ldquo;no&rdquo;
@@ -103,78 +112,79 @@
 
 The overview page leads back to the custom language codes overview.
 
-    >>> code_page = admin_browser.url
-    >>> admin_browser.getLink("custom language codes overview").click()
-    >>> admin_browser.url == custom_language_codes_page
+    >>> code_page = owner_browser.url
+    >>> owner_browser.getLink(
+    ...     "custom language codes overview").click()
+    >>> owner_browser.url == custom_language_codes_page
     True
 
-    >>> admin_browser.open(code_page)
+    >>> owner_browser.open(code_page)
 
-There is also a link for removing codes.  The admin follows the link and
+There is also a link for removing codes.  The owner follows the link and
 removes the "no" custom language code.
 
-    >>> admin_browser.getLink("remove custom language code").click()
-    >>> remove_page = admin_browser.url
-    >>> admin_browser.getControl("Remove").click()
+    >>> owner_browser.getLink("remove custom language code").click()
+    >>> remove_page = owner_browser.url
+    >>> owner_browser.getControl("Remove").click()
 
 This leads back to the overview page.
 
-    >>> admin_browser.url == custom_language_codes_page
+    >>> owner_browser.url == custom_language_codes_page
     True
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'empty')
-    >>> print extract_text(tag.renderContents())
-    No custom language codes have been defined.
-
-
-Non-admin access
-================
-
-A non-admin can see the page, actually, if they know the URL.  This can
-be convenient for debugging.
-
-    >>> owner_browser.open(custom_language_codes_page)
-
     >>> tag = find_tag_by_id(owner_browser.contents, 'empty')
     >>> print extract_text(tag.renderContents())
     No custom language codes have been defined.
 
+
+Unprivileged access
+===================
+
+A unprivileged user can see the page, actually, if they know the URL.
+This can be convenient for debugging.
+
+    >>> user_browser.open(custom_language_codes_page)
+
+    >>> tag = find_tag_by_id(user_browser.contents, 'empty')
+    >>> print extract_text(tag.renderContents())
+    No custom language codes have been defined.
+
 However all they get is a read-only version of the page.
 
-    >>> owner_browser.getLink("Add a custom language code").click()
+    >>> user_browser.getLink("Add a custom language code").click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError
 
 The page for adding custom language codes is not accessible to them.
 
+    >>> user_browser.open(add_page)
+    Traceback (most recent call last):
+    ...
+    Unauthorized: ...
+
+And naturally, if the owner creates a custom language code again, an
+unprivileged user can't remove it.
+
     >>> owner_browser.open(add_page)
-    Traceback (most recent call last):
-    ...
-    Unauthorized: ...
-
-And naturally, if an admin creates a custom language code again, a
-non-admin can't remove it.
-
-    >>> admin_browser.open(add_page)
-    >>> admin_browser.getControl("Language code:").value = 'no'
-    >>> admin_browser.getControl("Language:").value = ['nn']
-    >>> admin_browser.getControl("Add").click()
-
-    >>> owner_browser.open(custom_language_codes_page)
-    >>> tag = find_tag_by_id(owner_browser.contents, 'nonempty')
+    >>> owner_browser.getControl("Language code:").value = 'no'
+    >>> owner_browser.getControl("Language:").value = ['nn']
+    >>> owner_browser.getControl("Add").click()
+
+    >>> user_browser.open(custom_language_codes_page)
+    >>> tag = find_tag_by_id(user_browser.contents, 'nonempty')
     >>> print extract_text(tag.renderContents())
     Foo uses the following custom language codes:
     Code...     ...maps to language
     no          Norwegian Nynorsk
 
-    >>> owner_browser.getLink("no").click()
-    >>> owner_browser.getLink("remove custom language code")
+    >>> user_browser.getLink("no").click()
+    >>> user_browser.getLink("remove custom language code")
     Traceback (most recent call last):
     ...
     LinkNotFoundError
 
-    >>> owner_browser.open(remove_page)
+    >>> user_browser.open(remove_page)
     Traceback (most recent call last):
     ...
     Unauthorized: ...
@@ -188,7 +198,8 @@
 package--i.e. the combination of a distribution and a source package
 name.  However, since there is no Translations page for that type of
 object (and we'd probably never go there if there were), the link is
-shown on the source package page.
+shown on the source package page. For distributions, the owner of the
+distribution's translation group is a translations administrator.
 
     >>> login(ANONYMOUS)
     >>> from lp.registry.model.sourcepackage import SourcePackage
@@ -210,38 +221,44 @@
     ...     distroseries=other_series,
     ...     sourcepackagename=package.sourcepackagename),
     ...     rootsite="translations")
+    >>> translations_admin = factory.makePerson(
+    ...     email='[e-mail]', password='test')
+    >>> translationgroup = factory.makeTranslationGroup(
+    ...     owner=translations_admin)
+    >>> removeSecurityProxy(distro).translationgroup = translationgroup
     >>> logout()
 
-    >>> admin_browser.open(package_page)
+    >>> translations_browser = setupBrowser("Basic [e-mail]:test")
+    >>> translations_browser.open(package_page)
 
 Of course in this case, the notice about there being no custom language
 codes talks about a package, not a project.
 
-    >>> tag = find_custom_language_codes_link(admin_browser)
+    >>> tag = find_custom_language_codes_link(translations_browser)
     >>> print extract_text(tag.renderContents())
     If necessary, you may
     define custom language codes
     for this package.
 
-    >>> admin_browser.getLink("define custom language codes").click()
-    >>> custom_language_codes_page = admin_browser.url
+    >>> translations_browser.getLink("define custom language codes").click()
+    >>> custom_language_codes_page = translations_browser.url
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'empty')
+    >>> tag = find_tag_by_id(translations_browser.contents, 'empty')
     >>> print extract_text(tag.renderContents())
     No custom language codes have been defined.
 
-Again, an admin can add a language code.
-
-    >>> admin_browser.getLink("Add a custom language code").click()
-    >>> add_page = admin_browser.url
-
-    >>> admin_browser.getControl("Language code:").value = 'pt-br'
-    >>> admin_browser.getControl("Language:").value = ['pt_BR']
-    >>> admin_browser.getControl("Add").click()
+A translations admin can add a language code.
+
+    >>> translations_browser.getLink("Add a custom language code").click()
+    >>> add_page = translations_browser.url
+
+    >>> translations_browser.getControl("Language code:").value = 'pt-br'
+    >>> translations_browser.getControl("Language:").value = ['pt_BR']
+    >>> translations_browser.getControl("Add").click()
 
 The language code is displayed.
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'nonempty')
+    >>> tag = find_tag_by_id(translations_browser.contents, 'nonempty')
     >>> print extract_text(tag.renderContents())
     bar in distro uses the following custom language codes:
     Code...     ...maps to language
@@ -250,15 +267,15 @@
 It's also displayed identically on the same package but in another
 release series of the same distribution.
 
-    >>> admin_browser.open(page_in_other_series)
-    >>> tag = find_custom_language_codes_link(admin_browser)
+    >>> translations_browser.open(page_in_other_series)
+    >>> tag = find_custom_language_codes_link(translations_browser)
     >>> print extract_text(tag.renderContents())
     If necessary, you may
     define custom language codes
     for this package.
 
-    >>> admin_browser.getLink("define custom language codes").click()
-    >>> tag = find_tag_by_id(admin_browser.contents, 'nonempty')
+    >>> translations_browser.getLink("define custom language codes").click()
+    >>> tag = find_tag_by_id(translations_browser.contents, 'nonempty')
     >>> print extract_text(tag.renderContents())
     bar in distro uses the following custom language codes:
     Code...     ...maps to language
@@ -267,13 +284,13 @@
 
 The new code has a link there...
 
-    >>> admin_browser.getLink("pt-br").click()
+    >>> translations_browser.getLink("pt-br").click()
 
 ...and can be deleted.
 
-    >>> admin_browser.getLink("remove custom language code").click()
-    >>> admin_browser.getControl("Remove").click()
+    >>> translations_browser.getLink("remove custom language code").click()
+    >>> translations_browser.getControl("Remove").click()
 
-    >>> tag = find_tag_by_id(admin_browser.contents, 'empty')
+    >>> tag = find_tag_by_id(translations_browser.contents, 'empty')
     >>> print extract_text(tag.renderContents())
     No custom language codes have been defined.

=== modified file 'lib/lp/translations/templates/customlanguagecode-index.pt'
--- lib/lp/translations/templates/customlanguagecode-index.pt	2010-08-20 01:41:58 +0000
+++ lib/lp/translations/templates/customlanguagecode-index.pt	2010-12-23 09:44:44 +0000
@@ -26,7 +26,7 @@
 
     <div class="portlet">
       <ul class="horizontal">
-        <li tal:condition="context/required:launchpad.Admin">
+        <li tal:condition="context/required:launchpad.TranslationsAdmin">
           <a class="remove sprite"
              tal:attributes="href context/fmt:url:translations/+remove">
             remove custom language code

=== added file 'lib/lp/translations/templates/customlanguagecode-remove.pt'
--- lib/lp/translations/templates/customlanguagecode-remove.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/templates/customlanguagecode-remove.pt	2010-12-23 09:44:44 +0000
@@ -0,0 +1,18 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad">
+  <body>
+    <div metal:fill-slot="main">
+      <div metal:use-macro="context/@@launchpad_form/form">
+        <div metal:fill-slot="extra_info" class="documentDescription">
+          You are going to remove the custom language code
+          '<tal:language-code replace="view/code" />'.
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

=== modified file 'lib/lp/translations/templates/customlanguagecodes-index.pt'
--- lib/lp/translations/templates/customlanguagecodes-index.pt	2010-08-20 01:41:58 +0000
+++ lib/lp/translations/templates/customlanguagecodes-index.pt	2010-12-23 09:44:44 +0000
@@ -33,7 +33,8 @@
           <tr>
             <th>Code...</th>
             <th>...maps to language</th>
-            <th tal:condition="context/required:launchpad.Admin"></th>
+            <th tal:condition="context/required:launchpad.TranslationsAdmin">
+            </th>
           </tr>
         </thead>
         <tbody>
@@ -51,7 +52,7 @@
                 &mdash;
               </tal:nolanguage>
             </td>
-            <td tal:condition="context/required:launchpad.Admin">
+            <td tal:condition="context/required:launchpad.TranslationsAdmin">
               <a tal:attributes="href entry/fmt:url:translations/+remove"
                  alt="Remove"
                  title="Remove"
@@ -70,7 +71,7 @@
 
     <div>
       <a tal:attributes="href context/fmt:url:translations/+add-custom-language-code"
-         tal:condition="context/required:launchpad.Admin"
+         tal:condition="context/required:launchpad.TranslationsAdmin"
          class="add sprite">
         Add a custom language code
       </a>

=== modified file 'lib/lp/translations/templates/product-portlet-translatables.pt'
--- lib/lp/translations/templates/product-portlet-translatables.pt	2010-08-20 00:39:54 +0000
+++ lib/lp/translations/templates/product-portlet-translatables.pt	2010-12-23 09:44:44 +0000
@@ -65,7 +65,7 @@
 </div>
 
 <div class="portlet"
-     tal:condition="context/required:launchpad.Admin"
+     tal:condition="context/required:launchpad.TranslationsAdmin"
      id="custom-language-codes">
   If necessary, you may
   <a tal:attributes="href context/fmt:url:translations/+custom-language-codes"

=== modified file 'lib/lp/translations/templates/sourcepackage-translations.pt'
--- lib/lp/translations/templates/sourcepackage-translations.pt	2010-10-10 21:54:16 +0000
+++ lib/lp/translations/templates/sourcepackage-translations.pt	2010-12-23 09:44:44 +0000
@@ -39,7 +39,7 @@
               <a tal:attributes="href context/menu:navigation/download/url">
                 download a full tarball</a> with translations.
             </p>
-            <p tal:condition="context/required:launchpad.Admin"
+            <p tal:condition="context/distribution_sourcepackage/required:launchpad.TranslationsAdmin"
                id="custom-language-codes">
               If necessary, you may
               <a tal:attributes="href context/distribution_sourcepackage/fmt:url:translations/+custom-language-codes"