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
1=== modified file 'lib/lp/answers/browser/question.py'
2--- lib/lp/answers/browser/question.py 2009-09-28 09:11:17 +0000
3+++ lib/lp/answers/browser/question.py 2009-10-05 15:40:28 +0000
4@@ -832,7 +832,7 @@
5 """
6 return self.user is not None
7
8- @action(_('Add Comment'), name='comment', condition=canAddComment)
9+ @action(_('Just Add a Comment'), name='comment', condition=canAddComment)
10 def comment_action(self, action, data):
11 """Add a comment to a resolved question."""
12 self.context.addComment(self.user, data['message'])
13
14=== modified file 'lib/lp/answers/stories/question-workflow.txt'
15--- lib/lp/answers/stories/question-workflow.txt 2009-09-28 09:11:17 +0000
16+++ lib/lp/answers/stories/question-workflow.txt 2009-10-05 15:40:28 +0000
17@@ -87,11 +87,11 @@
18
19 A comment can be added at any point without altering the status. The
20 user simply enters the comment in the 'Message' box and clicks the
21-'Add Comment' button.
22+'Just Add a Comment' button.
23
24 >>> support_browser.getControl('Message').value = (
25 ... "I forgot to mention, in the meantime here is a workaround...")
26- >>> support_browser.getControl('Add Comment').click()
27+ >>> support_browser.getControl('Just Add a Comment').click()
28
29 This appends the comment to the question and it doesn't change its
30 status:
31@@ -222,11 +222,11 @@
32
33 When the question is Solved, it is still possible to add comments to it.
34 The user simply enters the comment in the 'Message' box and clicks the
35-'Add Comment' button.
36+'Just Add a Comment' button.
37
38 >>> owner_browser.getControl('Message').value = (
39 ... "The example now displays correctly. Thanks.")
40- >>> owner_browser.getControl('Add Comment').click()
41+ >>> owner_browser.getControl('Just Add a Comment').click()
42
43 This appends the comment to the question and it doesn't change its
44 status:
45
46=== modified file 'lib/lp/answers/stories/this-is-a-faq.txt'
47--- lib/lp/answers/stories/this-is-a-faq.txt 2009-09-28 09:11:17 +0000
48+++ lib/lp/answers/stories/this-is-a-faq.txt 2009-10-05 15:40:28 +0000
49@@ -394,7 +394,7 @@
50 Or you can just refer to FAQs in comments:
51
52 >>> user_browser.getControl('Message').value = 'No, this is FAQ #2'
53- >>> user_browser.getControl('Add Comment').click()
54+ >>> user_browser.getControl('Just Add a Comment').click()
55 >>> user_browser.getLink("FAQ #2").url
56 'http://answers.launchpad.dev/ubuntu/+faq/2'
57