Merge lp:~salgado/launchpad/bug-433991 into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Make sure zope.i18nmessageid.message.Message get interpolated when
building a page's title.

== Proposed fix ==

The new fmt:pagetitle formatter iterates over the breadcrumbs and join
their text in a single string, but the leaf breadcrumb may have Message
objects (from the view's .page_title) as their text, so when they're
joined they are not interpolated and we end up with things like 'Ask a
question about ${context}' in the title.

== Tests ==

./bin/test -vvm canonical.launchpad -t test_breadcrumbs

== Demo and Q/A ==

https://answers.launchpad.dev/ubuntu/+source/mozilla-firefox/+addquestion

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py
  lib/canonical/launchpad/browser/launchpad.py

[Henning Eggers (henninge)]

All fine as discussed on IRC. ;)

Henning

review: Approve (code)

[Brad Crittenden (bac)]

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2009-09-20 19:40:47 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2009-09-21 16:21:50 +0000
@@ -36,10 +36,12 @@
 import urllib
 from datetime import timedelta, datetime
 
+from zope import i18n
 from zope.app import zapi
 from zope.datetime import parseDatetimetz, tzinfo, DateTimeError
 from zope.component import getUtility, queryAdapter
 from zope.interface import implements
+from zope.i18nmessageid import Message
 from zope.publisher.interfaces import NotFound
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
@@ -284,6 +286,8 @@
                 template_api = PageTemplateContextsAPI(
                     dict(context=obj, template=template, view=view))
                 title = template_api.pagetitle()
+            if isinstance(title, Message):
+                title = i18n.translate(title, context=self.request)
             breadcrumb = Breadcrumb(None)
             breadcrumb._url = url
             breadcrumb.text = title
 
=== modified file 'lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py'
--- lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2009-09-18 12:15:42 +0000
+++ lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2009-09-21 16:21:50 +0000
@@ -6,10 +6,13 @@
 import unittest
 
 from zope.interface import implements
+from zope.i18nmessageid import Message
 
+from canonical.launchpad.browser.launchpad import Hierarchy
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.launchpad.webapp.publisher import canonical_url
+from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.launchpad.webapp.tests.breadcrumbs import (
     BaseBreadcrumbTestCase)
 from lp.testing import login, TestCase
@@ -63,6 +66,22 @@
         self.assertEquals(texts[-1],
                           '%s project files' % self.product.displayname)
 
+    def test_zope_i18n_Messages_are_interpolated(self):
+        # Views can use zope.i18nmessageid.Message as their title when they
+        # want to i18n it, but when that's the case we need to
+        # translate/interpolate the string.
+        class TestView:
+            """A test view that uses a Message as its page_title."""
+            page_title = Message(
+                '${name} test', mapping={'name': 'breadcrumb'})
+            __name__ = 'test-page'
+        test_view = TestView()
+        request = LaunchpadTestRequest()
+        request.traversed_objects = [self.product, test_view]
+        hierarchy_view = Hierarchy(self.product, request)
+        breadcrumb = hierarchy_view.makeBreadcrumbForRequestedPage()
+        self.assertEquals(breadcrumb.text, 'breadcrumb test')
+
 
 class TestExtraVHostBreadcrumbsOnHierarchyView(BaseBreadcrumbTestCase):
     """How our breadcrumbs behave when using a vhost other than the main one?