launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Rename TranslationsLayer:DistroSeries:+admin to DistroSeries:+translations-admin, to avoid a conflict with Registry's.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

There's a single view name that must be disambiguated by layer: DistroSeries:+admin, for which there's a separate view on TranslationsLayer.

This branch renames that view to DistroSeries:+translations-admin, leaving us with no view name conflicts between layers, and no blockers to flattening all the vhosts into mainsite.
-- 
https://code.launchpad.net/~wgrant/launchpad/distroseries-translations-admin/+merge/207095
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	2013-11-15 06:12:32 +0000
+++ lib/lp/translations/browser/configure.zcml	2014-02-19 05:22:32 +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	2012-02-28 04:24:19 +0000
+++ lib/lp/translations/browser/distroseries.py	2014-02-19 05:22:32 +0000
@@ -295,7 +295,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	2014-02-19 05:22:32 +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:...