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

[Chris Johnston]

Fixes some confusing text about bug subscriptions.

[Martin Pool (mbp)]

Thank you so much for all these patches, Chris.

I wonder if <https://bugs.launchpad.net/launchpad/+bug/487893> would
be easy to do a similar fix for? I would love to see that link added.

Martin

[Henning Eggers (henninge)]

Hi Chris,
thanks for these fixes.
In bugsubscription.py I found this:
"Your subscription to this bug has been updated."
That should probably read "bug report subscription" for consistency? Are there other cases that should be adapted?
Sorry if I seem nit-picky here but I want to avoid more of these little bugs being filed in the future if we can do it right right now.

Thanks again!
Henning

review: Approve

[Chris Johnston (cjohnston)]

I am not seeing any more, but that's not to say there aren't.. I updated it.

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2011-05-12 14:59:21 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2011-05-16 19:56:26 +0000
@@ -402,7 +402,7 @@
         """Handle a subscribe request."""
         self.context.bug.subscribe(self.user, self.user, level=level)
         self.request.response.addNotification(
-            "You have been subscribed to this bug.")
+            "You have subscribed to this bug report.")
 
     def _handleUnsubscribe(self, user):
         """Handle an unsubscribe request."""
@@ -456,7 +456,7 @@
         subscription = self.current_user_subscription
         subscription.bug_notification_level = level
         self.request.response.addNotification(
-            "Your subscription to this bug has been updated.")
+            "Your bug report subscription has been updated.")
 
     def _getUnsubscribeNotification(self, user, unsubed_dupes):
         """Construct and return the unsubscribe-from-bug feedback message.

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2011-05-04 16:46:43 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2011-05-16 19:56:26 +0000
@@ -747,7 +747,7 @@
             else:
                 bug.subscribe(self.user, self.user)
                 self.request.response.addNotification(
-                    "You have been subscribed to this bug.")
+                    "You have subscribed to this bug report.")
 
         self.next_url = canonical_url(bug.bugtasks[0])
 

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-05-13 17:23:27 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-05-16 19:56:26 +0000
@@ -1452,7 +1452,7 @@
         if self.request.form.get('subscribe', False):
             bugtask.bug.subscribe(self.user, self.user)
             self.request.response.addNotification(
-                "You have been subscribed to this bug.")
+                "You have subscribed to this bug report.")
 
         # Save the field names we extract from the form in a separate
         # list, because we modify this list of names later if the

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions-advanced-features.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions-advanced-features.txt	2011-04-15 11:02:24 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions-advanced-features.txt	2011-05-16 19:56:26 +0000
@@ -40,4 +40,4 @@
 
     >>> for message in find_tags_by_class(user_browser.contents, 'message'):
     ...     print extract_text(message)
-    You have been subscribed to this bug.
+    You have subscribed to this bug report.

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt	2010-12-23 12:55:53 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt	2011-05-16 19:56:26 +0000
@@ -32,7 +32,7 @@
 
   >>> for tag in find_tags_by_class(browser.contents, "informational message"):
   ...   print tag.renderContents()
-  You have been subscribed to this bug.
+  You have subscribed to this bug report.
 
 There's also now a link to unsubscribe the user next to the name. It's a
 relative URL to +subscribe, so it will only work when the portlet is

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt	2011-05-16 19:56:26 +0000
@@ -14,7 +14,7 @@
 
     >>> print browser.contents
     <!DOCTYPE...
-    ...You have been subscribed to this bug...
+    ...You have subscribed to this bug report...
 
 If you're already subscribed, the checkbox is not shown.
 

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2011-04-20 14:56:23 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2011-05-16 19:56:26 +0000
@@ -131,7 +131,7 @@
     >>> for message in get_feedback_messages(user_browser.contents):
     ...     print message
     This bug is already marked as affecting you.
-    You have been subscribed to this bug.
+    You have subscribed to this bug report.
 
 
 Filing a bug when there are none similar