Merge lp:~jtv/launchpad/bug-433989 into lp:launchpad

[Jeroen T. Vermeulen]

[Jeroen T. Vermeulen (jtv)]

= Bug 433989 =

I missed a few spots when I updated the page headings for the
TranslationGroup and Translator pages. (A Translator is really just a
membership record in a TranslationGroup).

Of these, I fixed a bad page title that still contained too much context
but left the other—a missing breadcrumb for Translator—unfixed. The
reason is that the breadcrumb would link to a page that not everyone who
saw it would have access to.

As a drive-by cleanup, this branch also removes LanguageNavigation which
became unnecessary as Salgado fixed the bug that made it necessary last
week.

To see the change, go to

https://translations.launchpad.dev/+groups/launchpad-translators/+reassign

or

https://translations.net.launchpad.net/+groups/launchpad-translators/+reassign

...before and after the change. The last breadcrumb should become a lot
shorter.

No lint.

Jeroen

[Eleanor Berger (intellectronica)]

r=me
ui=me

review: Approve

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-09-24 15:33:40 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-09-28 09:49:12 +0000
@@ -299,7 +299,6 @@
         <browser:navigation
             module="lp.translations.browser.language"
             classes="
-                LanguageNavigation
                 LanguageSetNavigation"/>
         <browser:defaultView
             for="canonical.launchpad.interfaces.ILanguage"

=== modified file 'lib/lp/translations/browser/language.py'
--- lib/lp/translations/browser/language.py	2009-09-17 21:03:25 +0000
+++ lib/lp/translations/browser/language.py	2009-09-28 09:49:12 +0000
@@ -7,7 +7,6 @@
 __all__ = [
     'LanguageAddView',
     'LanguageAdminView',
-    'LanguageNavigation',
     'LanguageSetBreadcrumb',
     'LanguageSetContextMenu',
     'LanguageSetNavigation',
@@ -26,9 +25,9 @@
     ITranslationsPerson)
 from lp.translations.browser.translations import TranslationsMixin
 from canonical.launchpad.webapp import (
-    GetitemNavigation, LaunchpadView, LaunchpadFormView,
-    LaunchpadEditFormView, action, canonical_url, ContextMenu, Navigation,
-    NavigationMenu, enabled_with_permission, Link, custom_widget)
+    action, canonical_url, ContextMenu, custom_widget,
+    enabled_with_permission, GetitemNavigation, LaunchpadEditFormView,
+    LaunchpadFormView, LaunchpadView, Link, NavigationMenu)
 from lp.translations.utilities.pluralforms import make_friendly_plural_forms
 
 from canonical.widgets import LabeledMultiCheckBoxWidget
@@ -43,14 +42,6 @@
         return englishname
 
 
-class LanguageNavigation(Navigation):
-    """Make breadcrumb appear for language."""
-    # XXX: JeroenVermeulen 2009-09-18, bug=423898: Salgado is working to
-    # make this Navigation class obsolete.  Once 423898 is solved, this
-    # class and the ZCML referring to it can go.
-    usedfor = ILanguage
-
-
 class LanguageBreadcrumb(Breadcrumb):
     """`Breadcrumb` for `ILanguage`."""
     @property

=== modified file 'lib/lp/translations/browser/translationgroup.py'
--- lib/lp/translations/browser/translationgroup.py	2009-09-17 11:28:13 +0000
+++ lib/lp/translations/browser/translationgroup.py	2009-09-28 09:49:12 +0000
@@ -212,6 +212,12 @@
 class TranslationGroupReassignmentView(ObjectReassignmentView):
     """View class for changing translation group owner."""
 
+    page_title = "Change owner"
+
+    @property
+    def label(self):
+        return "Change the owner of %s" % self.contextName
+
     @property
     def contextName(self):
         return self.context.title or self.context.name

=== modified file 'lib/lp/translations/browser/translator.py'
--- lib/lp/translations/browser/translator.py	2009-09-17 14:29:22 +0000
+++ lib/lp/translations/browser/translator.py	2009-09-28 09:49:12 +0000
@@ -2,6 +2,11 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
+__all__ = [
+    'TranslatorAdminView',
+    'TranslatorEditView',
+    'TranslatorRemoveView',
+    ]
 
 import cgi
 
@@ -11,12 +16,6 @@
     action, canonical_url, LaunchpadEditFormView, LaunchpadFormView)
 from canonical.launchpad.webapp.menu import structured
 
-__all__ = [
-    'TranslatorAdminView',
-    'TranslatorEditView',
-    'TranslatorRemoveView',
-    ]
-
 
 class TranslatorAdminView(LaunchpadEditFormView):
     """View class to administer ITranslator objects"""