launchpad-reviewers team mailing list archive

[Chris Johnston <chris.johnston@xxxxxxxxxxxxx>]

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

Commit message:
Changes subscription descriptions to be more grammatically correct.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #314402 in Launchpad itself: "Confirmation of subscribing to a branch is ungrammatical"
  https://bugs.launchpad.net/launchpad/+bug/314402

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

=== modified file 'lib/lp/code/browser/branchsubscription.py'
--- lib/lp/code/browser/branchsubscription.py	2012-11-26 08:40:20 +0000
+++ lib/lp/code/browser/branchsubscription.py	2012-12-18 03:00:43 +0000
@@ -141,7 +141,6 @@
                 self.user)
 
             self.add_notification_message(
-                'You have subscribed to this branch with: ',
                 notification_level, max_diff_lines, review_level)
 
 

=== modified file 'lib/lp/code/enums.py'
--- lib/lp/code/enums.py	2012-11-07 05:06:18 +0000
+++ lib/lp/code/enums.py	2012-12-18 03:00:43 +0000
@@ -212,7 +212,8 @@
     NODIFF = DBItem(0, """
         Don't send diffs
 
-        Don't send generated diffs with the revision notifications.
+        You have subscribed to status changes and new revisions 
+        for this branch.
         """)
 
     HALFKLINES = DBItem(500, """
@@ -272,8 +273,8 @@
     FULL = DBItem(3, """
         Branch attribute and revision notifications
 
-        Send notifications for both branch attribute updates
-        and new revisions added to the branch.
+        You have subscribed to status changes, new revisions 
+        with diffs, and code reviews for this branch.
         """)
 
 
@@ -288,7 +289,7 @@
     NOEMAIL = DBItem(0, """
         No email
 
-        Do not send any email about code review for this branch.
+        You will not get any email about code reviews for this branch.
         """)
 
     STATUS = DBItem(1, """