launchpad-reviewers team mailing list archive

[Chris Johnston <chris@xxxxxxxxxxxxxxxxx>]

Chris Johnston has proposed merging lp:~chrisjohnston/launchpad/197793 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #197793 in Launchpad itself: ""You are a direct subscriber of the bug" is bad English"
  https://bugs.launchpad.net/launchpad/+bug/197793

For more details, see:
https://code.launchpad.net/~chrisjohnston/launchpad/197793/+merge/61053
-- 
https://code.launchpad.net/~chrisjohnston/launchpad/197793/+merge/61053
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~chrisjohnston/launchpad/197793 into lp:launchpad.

=== modified file 'lib/canonical/launchpad/webapp/error.py'
--- lib/canonical/launchpad/webapp/error.py	2011-04-19 04:17:54 +0000
+++ lib/canonical/launchpad/webapp/error.py	2011-05-16 02:12:33 +0000
@@ -293,4 +293,7 @@
 class NoReferrerErrorView(SystemErrorView):
     """View rendered when a POST request does not include a REFERER header."""
 
+    page_title = "Error: Forbidden"
+    override_title_breadcrumbs = True
+
     response_code = 403 # Forbidden.

=== modified file 'lib/lp/bugs/mail/bugnotificationrecipients.py'
--- lib/lp/bugs/mail/bugnotificationrecipients.py	2011-03-04 16:38:20 +0000
+++ lib/lp/bugs/mail/bugnotificationrecipients.py	2011-05-16 02:12:33 +0000
@@ -76,11 +76,11 @@
         """Registers a subscriber of a duplicate of this bug."""
         reason = "Subscriber of Duplicate"
         if person.isTeam():
-            text = ("are a member of %s, which is a subscriber "
-                    "of a duplicate bug" % person.displayname)
+            text = ("are a member of %s, which is subscribed "
+                    "to a duplicate bug" % person.displayname)
             reason += " @%s" % person.name
         else:
-            text = "are a direct subscriber of a duplicate bug"
+            text = "are subscribed to a duplicate bug report"
         if duplicate_bug is not None:
             text += " (%s)" % duplicate_bug.id
         self._addReason(person, text, reason)
@@ -89,11 +89,11 @@
         """Registers a direct subscriber of this bug."""
         reason = "Subscriber"
         if person.isTeam():
-            text = ("are a member of %s, which is a direct subscriber"
+            text = ("are a member of %s, which is subscribed"
                     % person.displayname)
             reason += " @%s" % person.name
         else:
-            text = "are a direct subscriber of the bug"
+            text = "are subscribed to the bug report"
         self._addReason(person, text, reason)
 
     def addAssignee(self, person):