Hi Adi!

Thanks for yet another branch. The test is failing for me locally, and I've a few typo fixes below. Once they're fixed up, r=me.

Thanks!

On Thu, Apr 22, 2010 at 5:19 AM, Adi Roiban <email address hidden> wrote:
> Adi Roiban has proposed merging lp:~adiroiban/launchpad/bug-487137 into lp:launchpad/devel.
...
>
> == Tests ==<email address hidden>
>
> lp-test custom-language-codes

Running the test results in a failure:
http://pastebin.ubuntu.com/420372/

>
> == Demo and Q/A ==
>
> Login as Rosetta Administrator.
> Go to a product or sourcepackage page:
>
> https://translations.launchpad.dev/evolution
> https://translations.launchpad.dev/ubuntu/+source/evolution
>
> You should see a link for defining custom language codes.
> Click on the link.
> Add a language code.
> Click on the new language code.
> Remove the language code.

Great. Strangely, reverting your security.py change and logging in as <email address hidden> still allows me to create language codes, just not delete them.

I see it's not really part of this branch, but when removing a language there is no text (other than the main heading, breadcrumbs and the remove or cancel options). It looks a bit strange, and any text would just be repeating what the main heading already says, but adding the label to the form might look less strange... see what you think (as it's not part of this branch, I'll leave it up to you).

> === modified file 'lib/canonical/launchpad/security.py'
> --- lib/canonical/launchpad/security.py 2010-04-18 22:31:40 +0000
> +++ lib/canonical/launchpad/security.py 2010-04-22 03:19:15 +0000
> @@ -112,6 +112,8 @@
>  from lp.blueprints.interfaces.sprintspecification import (
>     ISprintSpecification)
>  from lp.registry.interfaces.teammembership import ITeamMembership
> +from lp.translations.interfaces.customlanguagecode import (
> +    ICustomLanguageCode, IHasCustomLanguageCodes)
>  from lp.translations.interfaces.translationgroup import (
>     ITranslationGroup, ITranslationGroupSet)
>  from lp.translations.interfaces.translationimportqueue import (
> @@ -1652,6 +1654,28 @@
>     usedfor = ILanguage
>
>
> +class AdminCustomLanguageCodes(OnlyRosettaExpertsAndAdmins):
> +    """Controls administration of custom language codes.
> +
> +    Rosetta expters and Launchpad administrators can admister custom language

s/expters/experts
s/admister/administer

> +    codes.
> +    """
> +
> +    permission = 'launchpad.TranslationsAdmin'
> +    usedfor = IHasCustomLanguageCodes
> +
> +
> +class AdminCustomLanguageCode(OnlyRosettaExpertsAndAdmins):
> +    """Controls administration for a custom language code.
> +
> +    Rosetta expters and Launchpad administrators can admister a custom

as above.

> +    language code.
> +    """
> +
> +    permission = 'launchpad.TranslationsAdmin'
> +    usedfor = ICustomLanguageCode
> +
> +
>  class AccessBranch(AuthorizationBase):
>     """Controls visibility of branches.
>
>

> === 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-04-22 03:19:15 +0000
...
> @@ -35,12 +34,20 @@
>     >>> logout()
>
>     >>> owner_browser = setupBrowser("Basic <email address hidden>:test")
> +    >>> rosetta_admin_browser = setupRosettaExpertBrowser()
>
> -An administrator sees the link to the custom language codes on a
> -project's main translations page.
> +An Launchpad administrator or Rosetta expert sees the link to the custom

s/An/A

> +language codes on a project's main translations page.
>
>     >>> admin_browser.open(product_page)
> -    >>> tag = find_custom_language_codes_link(admin_browser)
> +    >>> tag = find_custom_language_codes_link(rosetta_admin_browser)

I'm guessing this is the source of the test failure ^^^, I'm assuming you meant to find the custom language codes using the admin_browser here (which just opened the product page), as you test the rosetta admin browser below?

> +    >>> print extract_text(tag.renderContents())
> +    If necessary, you may
> +    define custom language codes
> +    for this project.
> +
> +    >>> 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

Thanks!