Launchpad itself

Merge lp:~cjohnston/launchpad/197793 into lp:launchpad

  1. 197793
  2. Merge into devel
Proposed by Chris Johnston
Status: Merged
Approved by: Steve Kowalik
Approved revision: no longer in the source branch.
Merged at revision: 13162
Proposed branch: lp:~cjohnston/launchpad/197793
Merge into: lp:launchpad
Diff against target: 33 lines (+6/-6)
1 file modified
lib/lp/bugs/mail/bugnotificationrecipients.py (+6/-6)
To merge this branch: bzr merge lp:~cjohnston/launchpad/197793
Reviewer Review Type Date Requested Status
Henning Eggers (community) Approve
Review via email: mp+61053@code.launchpad.net

Commit message

[r=henninge][bug=197793] Changes the notification of how a user is subscribed to a bug to read better.

To post a comment you must log in.
Revision history for this message
Henning Eggers (henninge) wrote :

Thanks for changing these but they seem inconsistent to me. I may be wrong, though, as I may be missing context.

22 + text = ("are a member of %s, which is subscribed "
23 + "to a duplicate bug" % person.displayname)

"to a duplicate bug report" ... ?

35 - text = ("are a member of %s, which is a direct subscriber"
36 + text = ("are a member of %s, which is subscribed"

"... which is subscribed to the bug report" (See the else branch below it).

Cheers,
Henning

review: Needs Fixing
Revision history for this message
Henning Eggers (henninge) wrote :

Great, thanks. ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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-17 01:35:48 +0000
@@ -76,11 +76,11 @@
76 """Registers a subscriber of a duplicate of this bug."""76 """Registers a subscriber of a duplicate of this bug."""
77 reason = "Subscriber of Duplicate"77 reason = "Subscriber of Duplicate"
78 if person.isTeam():78 if person.isTeam():
79 text = ("are a member of %s, which is a subscriber "79 text = ("are a member of %s, which is subscribed "
80 "of a duplicate bug" % person.displayname)80 "to a duplicate bug report" % person.displayname)
81 reason += " @%s" % person.name81 reason += " @%s" % person.name
82 else:82 else:
83 text = "are a direct subscriber of a duplicate bug"83 text = "are subscribed to a duplicate bug report"
84 if duplicate_bug is not None:84 if duplicate_bug is not None:
85 text += " (%s)" % duplicate_bug.id85 text += " (%s)" % duplicate_bug.id
86 self._addReason(person, text, reason)86 self._addReason(person, text, reason)
@@ -89,11 +89,11 @@
89 """Registers a direct subscriber of this bug."""89 """Registers a direct subscriber of this bug."""
90 reason = "Subscriber"90 reason = "Subscriber"
91 if person.isTeam():91 if person.isTeam():
92 text = ("are a member of %s, which is a direct subscriber"92 text = ("are a member of %s, which is subscribed "
93 % person.displayname)93 "to the bug report" % person.displayname)
94 reason += " @%s" % person.name94 reason += " @%s" % person.name
95 else:95 else:
96 text = "are a direct subscriber of the bug"96 text = "are subscribed to the bug report"
97 self._addReason(person, text, reason)97 self._addReason(person, text, reason)
9898
99 def addAssignee(self, person):99 def addAssignee(self, person):