launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/distroseries-translations-admin into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/distroseries-translations-admin/+merge/83591

There are currently two views registered as DistroSeries:+admin: Registry's on the base layer, and Translations' on TranslationsLayer. This is the only exposed view name conflict in the entire application.

In order to collapse to a single domain, we need to resolve the conflict. This branch renames Translations' to +translations-admin.
-- 
https://code.launchpad.net/~wgrant/launchpad/distroseries-translations-admin/+merge/83591
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/distroseries-translations-admin into lp:launchpad.

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2011-11-27 01:08:41 +0000
+++ lib/lp/translations/browser/configure.zcml	2011-11-28 12:04:42 +0000
@@ -944,9 +944,8 @@
         for="lp.registry.interfaces.distroseries.IDistroSeries"
         permission="launchpad.TranslationsAdmin"
         class="lp.translations.browser.distroseries.DistroSeriesTranslationsAdminView"
-        name="+admin"
-        template="../../app/templates/generic-edit.pt"
-        layer="lp.translations.publisher.TranslationsLayer"/>
+        name="+translations-admin"
+        template="../../app/templates/generic-edit.pt"/>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"
         name="+imports"

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2011-05-10 10:26:50 +0000
+++ lib/lp/translations/browser/distroseries.py	2011-11-28 12:04:42 +0000
@@ -293,7 +293,7 @@
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def admin(self):
-        return Link('+admin', 'Settings', site='translations')
+        return Link('+translations-admin', 'Settings', site='translations')
 
     @enabled_with_permission('launchpad.Edit')
     def templates(self):

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt	2010-02-17 13:06:35 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt	2011-11-28 12:04:42 +0000
@@ -38,7 +38,8 @@
 And the page is not available either:
 
     >>> anon_browser.open(
-    ...     'http://translations.launchpad.dev/ubuntu/hoary/+admin')
+    ...     'http://translations.launchpad.dev/ubuntu/hoary/'
+    ...     '+translations-admin')
     Traceback (most recent call last):
     ...
     Unauthorized:...