Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve-text-for-contributors #11532

Merged
merged 9 commits into from
Jan 30, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1133,10 +1133,13 @@ en:
logged_out: "Successfully logged out."
notes_controller:
research_notes: "Research notes"
thank_you_for_contribution: "Success! Thank you for contributing open research,
and thanks for your patience while your post is approved by <a href='/wiki/moderation'>community
moderators</a> and we'll email you when it is published. In the meantime, if
you have more to contribute, feel free to do so."
thank_you_for_contribution: |
<h2>Success! You did it! Hooray!</h2>
Copy link
Collaborator

@cesswairimu cesswairimu Oct 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @banjo-tech seems there is some syntax error, i guess its indentation - the < of h2 should be indented 2 spaces deep inline with the a in "thank" above, could you please check. Thanks for working on this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @cesswairimu I do not think I understand what the error is but I have h2 and anchor tag are on the same line now.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant line 1137 maybe should start inline with the a of "thank" on line 1136 ... does that make sense?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 1136 doesn't have an anchor tag
are you suggesting I add an anchor tag to line 1136?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant like so 700b639 . Lets see if the tests will pass, thanks

<hr>
<p>Thank you so much for contributing open research and being part of our community.</p>
<h2>Here's what's happening now:</h2>
<hr>
<p>Your <a href='/wiki/first-contribution'>first contribution</a> is awaiting approval by <a href='/wiki/moderation'>community moderators</a>. <b>If you have asked an urgent question about an environmental concern, we will prioritize reviewing it</b>. Thank you for your patience, in the next hours your contribution should be public. We will email you when it is published. In the meantime, if you have more to contribute, feel free to do so. Visit the <a href='/wiki/welcome'>Welcome Page</a> to discover more ways to connect.</p>
thank_you_for_question: "Success! Thank you for contributing with a question, and
thanks for your patience while your question is approved by <a href='/wiki/moderation'>community
moderators</a> and we'll email you when it is published."
3 changes: 1 addition & 2 deletions test/functional/notes_controller_test.rb
Original file line number Diff line number Diff line change
@@ -309,8 +309,7 @@ def teardown
tags: 'balloon-mapping,event'
}
# , :main_image => "/images/testimage.jpg"

assert_equal "Success! Thank you for contributing open research, and thanks for your patience while your post is approved by <a href='/wiki/moderation'>community moderators</a> and we'll email you when it is published. In the meantime, if you have more to contribute, feel free to do so.", flash[:notice]
assert_equal "<h2>Success! You did it! Hooray!</h2>\n<hr>\n<p>Thank you so much for contributing open research and being part of our community.</p>\n<h2>Here's what's happening now:</h2>\n<hr>\n<p>Your <a href='/wiki/first-contribution'>first contribution</a> is awaiting approval by <a href='/wiki/moderation'>community moderators</a>. <b>If you have asked an urgent question about an environmental concern, we will prioritize reviewing it</b>. Thank you for your patience, in the next hours your contribution should be public. We will email you when it is published. In the meantime, if you have more to contribute, feel free to do so. Visit the <a href='/wiki/welcome'>Welcome Page</a> to discover more ways to connect.</p>\n", flash[:notice]
assert_nil flash[:warning] # no double notice
assert_equal 4, Node.last.status
assert_equal title, Node.last.title