Launchpad itself

Merge lp:~allenap/launchpad/just-comment-on-question-bug-114710-wording-change into lp:launchpad

  1. just-comment-on-question-bug-114710-wording-change
  2. Merge into devel
Proposed by Gavin Panella
Status: Merged
Merged at revision: not available
Proposed branch: lp:~allenap/launchpad/just-comment-on-question-bug-114710-wording-change
Merge into: lp:launchpad
Diff against target: 56 lines
3 files modified
lib/lp/answers/browser/question.py (+1/-1)
lib/lp/answers/stories/question-workflow.txt (+4/-4)
lib/lp/answers/stories/this-is-a-faq.txt (+1/-1)
To merge this branch: bzr merge lp:~allenap/launchpad/just-comment-on-question-bug-114710-wording-change
Reviewer Review Type Date Requested Status
Aaron Bentley (community) code Approve
Review via email: mp+12879@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Change the wording of the "Add Comment" button in a question page to "Just Add a Comment", as discussed on launchpad-dev. To summarise: kiko suggested the change, beuno agreed with it.

bin/test -vvm lp.answers

Only bogus lint.

Revision history for this message
Aaron Bentley (abentley) wrote :

Looks fine.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py 2009-09-28 09:11:17 +0000
+++ lib/lp/answers/browser/question.py 2009-10-05 15:40:28 +0000
@@ -832,7 +832,7 @@
832 """832 """
833 return self.user is not None833 return self.user is not None
834834
835 @action(_('Add Comment'), name='comment', condition=canAddComment)835 @action(_('Just Add a Comment'), name='comment', condition=canAddComment)
836 def comment_action(self, action, data):836 def comment_action(self, action, data):
837 """Add a comment to a resolved question."""837 """Add a comment to a resolved question."""
838 self.context.addComment(self.user, data['message'])838 self.context.addComment(self.user, data['message'])
839839
=== modified file 'lib/lp/answers/stories/question-workflow.txt'
--- lib/lp/answers/stories/question-workflow.txt 2009-09-28 09:11:17 +0000
+++ lib/lp/answers/stories/question-workflow.txt 2009-10-05 15:40:28 +0000
@@ -87,11 +87,11 @@
8787
88A comment can be added at any point without altering the status. The88A comment can be added at any point without altering the status. The
89user simply enters the comment in the 'Message' box and clicks the89user simply enters the comment in the 'Message' box and clicks the
90'Add Comment' button.90'Just Add a Comment' button.
9191
92 >>> support_browser.getControl('Message').value = (92 >>> support_browser.getControl('Message').value = (
93 ... "I forgot to mention, in the meantime here is a workaround...")93 ... "I forgot to mention, in the meantime here is a workaround...")
94 >>> support_browser.getControl('Add Comment').click()94 >>> support_browser.getControl('Just Add a Comment').click()
9595
96This appends the comment to the question and it doesn't change its96This appends the comment to the question and it doesn't change its
97status:97status:
@@ -222,11 +222,11 @@
222222
223When the question is Solved, it is still possible to add comments to it.223When the question is Solved, it is still possible to add comments to it.
224The user simply enters the comment in the 'Message' box and clicks the224The user simply enters the comment in the 'Message' box and clicks the
225'Add Comment' button.225'Just Add a Comment' button.
226226
227 >>> owner_browser.getControl('Message').value = (227 >>> owner_browser.getControl('Message').value = (
228 ... "The example now displays correctly. Thanks.")228 ... "The example now displays correctly. Thanks.")
229 >>> owner_browser.getControl('Add Comment').click()229 >>> owner_browser.getControl('Just Add a Comment').click()
230230
231This appends the comment to the question and it doesn't change its231This appends the comment to the question and it doesn't change its
232status:232status:
233233
=== modified file 'lib/lp/answers/stories/this-is-a-faq.txt'
--- lib/lp/answers/stories/this-is-a-faq.txt 2009-09-28 09:11:17 +0000
+++ lib/lp/answers/stories/this-is-a-faq.txt 2009-10-05 15:40:28 +0000
@@ -394,7 +394,7 @@
394Or you can just refer to FAQs in comments:394Or you can just refer to FAQs in comments:
395395
396 >>> user_browser.getControl('Message').value = 'No, this is FAQ #2'396 >>> user_browser.getControl('Message').value = 'No, this is FAQ #2'
397 >>> user_browser.getControl('Add Comment').click()397 >>> user_browser.getControl('Just Add a Comment').click()
398 >>> user_browser.getLink("FAQ #2").url398 >>> user_browser.getLink("FAQ #2").url
399 'http://answers.launchpad.dev/ubuntu/+faq/2'399 'http://answers.launchpad.dev/ubuntu/+faq/2'
400400