launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/ppa-packages-deletion-grammar into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/ppa-packages-deletion-grammar/+merge/90646

At least *try* for better grammar in the deletion notification when deleting packages from a PPA.
-- 
https://code.launchpad.net/~stevenk/launchpad/ppa-packages-deletion-grammar/+merge/90646
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/ppa-packages-deletion-grammar into lp:launchpad.

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2012-01-06 14:22:17 +0000
+++ lib/lp/soyuz/browser/archive.py	2012-01-30 04:24:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Browser views for archive."""
@@ -1213,8 +1213,7 @@
         # Present a page notification describing the action.
         messages = []
         messages.append(
-            '<p>Source and binaries deleted by %s request:'
-            % self.user.displayname)
+            '<p>Source and binaries deleted by %s:' % self.user.displayname)
         for source in selected_sources:
             messages.append('<br/>%s' % source.displayname)
         messages.append('</p>')

=== modified file 'lib/lp/soyuz/stories/ppa/xx-delete-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-delete-packages.txt	2012-01-15 11:06:57 +0000
+++ lib/lp/soyuz/stories/ppa/xx-delete-packages.txt	2012-01-30 04:24:25 +0000
@@ -111,7 +111,7 @@
     >>> messages = get_feedback_messages(admin_browser.contents)
     >>> for msg in messages:
     ...     print msg
-    Source and binaries deleted by Foo Bar request:
+    Source and binaries deleted by Foo Bar:
     iceweasel 1.0 in breezy-autotest
     Deletion comment: None
 
@@ -155,7 +155,7 @@
     >>> messages = get_feedback_messages(admin_browser.contents)
     >>> for msg in messages:
     ...     print msg
-    Source and binaries deleted by Foo Bar request:
+    Source and binaries deleted by Foo Bar:
     cdrkit 1.0 in breezy-autotest
     Deletion comment: DO &lt;where is my XSS ?&gt; IT
 
@@ -242,7 +242,7 @@
     >>> messages = get_feedback_messages(admin_browser.contents)
     >>> for msg in messages:
     ...     print msg
-    Source and binaries deleted by Foo Bar request:
+    Source and binaries deleted by Foo Bar:
     iceweasel 1.0 in warty
     pmount 0.1-1 in warty
     Deletion comment: DO IT AGAIN !
@@ -459,7 +459,7 @@
     >>> messages = get_feedback_messages(user_browser.contents)
     >>> for msg in messages:
     ...     print msg
-    Source and binaries deleted by No Privileges Person request:
+    Source and binaries deleted by No Privileges Person:
     foo 1.0 in hoary
     Deletion comment: Deletion of a number of base pairs that is ...