From ff094295a56c2bc1a2ff4f26e91b2af2773c1eb1 Mon Sep 17 00:00:00 2001 From: Ogunbanjo oluwadamilare Date: Sat, 22 Oct 2022 17:50:10 +0100 Subject: [PATCH 1/9] improve-text-for-contributors --- config/locales/en.yml | 15 +++++++++++---- test/functional/notes_controller_test.rb | 11 ++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index aff68b9445..8295f0e8a3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1133,10 +1133,17 @@ 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 community - moderators 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: | +

Success! You did it! Hooray!

+
+

Thank you so much for contributing open research and being part of our community.

+

Here's what's happening now:

+
+

Your first contribution is awaiting approval by community moderators. + If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. + Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. + In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. +

thank_you_for_question: "Success! Thank you for contributing with a question, and thanks for your patience while your question is approved by community moderators and we'll email you when it is published." diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb index 0952b864d0..d6376ddf25 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/functional/notes_controller_test.rb @@ -310,7 +310,16 @@ def teardown } # , :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 community moderators 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 "

Success! You did it! Hooray!

+
+

Thank you so much for contributing open research and being part of our community.

+

Here's what's happening now:

+
+

Your first contribution is awaiting approval by community moderators. + If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. + Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. + In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. +

", flash[:notice] assert_nil flash[:warning] # no double notice assert_equal 4, Node.last.status assert_equal title, Node.last.title From 5c4b9da7dfd364b23c53097750c09265d96581db Mon Sep 17 00:00:00 2001 From: Ogunbanjo oluwadamilare Date: Mon, 24 Oct 2022 13:52:07 +0100 Subject: [PATCH 2/9] update --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 8295f0e8a3..78826892ed 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1134,8 +1134,8 @@ en: notes_controller: research_notes: "Research notes" thank_you_for_contribution: | -

Success! You did it! Hooray!

-
+

Success! You did it! Hooray!

+

Thank you so much for contributing open research and being part of our community.

Here's what's happening now:

From 700b6395faa3d3ebdec1f3dc352938bb3f6d8513 Mon Sep 17 00:00:00 2001 From: Cess Date: Mon, 31 Oct 2022 20:45:02 +0300 Subject: [PATCH 3/9] Update en.yml fix indentation --- config/locales/en.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 78826892ed..e4bce41e40 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1134,16 +1134,16 @@ en: notes_controller: research_notes: "Research notes" thank_you_for_contribution: | -

Success! You did it! Hooray!

-
-

Thank you so much for contributing open research and being part of our community.

-

Here's what's happening now:

-
-

Your first contribution is awaiting approval by community moderators. - If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. - Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. - In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. -

+

Success! You did it! Hooray!

+
+

Thank you so much for contributing open research and being part of our community.

+

Here's what's happening now:

+
+

Your first contribution is awaiting approval by community moderators. + If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. + Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. + In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. +

thank_you_for_question: "Success! Thank you for contributing with a question, and thanks for your patience while your question is approved by community moderators and we'll email you when it is published." From 8fb26fd30915529be50dfb1b0f6afaf2a1814b4d Mon Sep 17 00:00:00 2001 From: Cess Date: Mon, 31 Oct 2022 21:12:50 +0300 Subject: [PATCH 4/9] fix indentation --- config/locales/en.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index e4bce41e40..035dc74c37 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1133,21 +1133,21 @@ en: logged_out: "Successfully logged out." notes_controller: research_notes: "Research notes" - thank_you_for_contribution: | -

Success! You did it! Hooray!

-
-

Thank you so much for contributing open research and being part of our community.

-

Here's what's happening now:

-
-

Your first contribution is awaiting approval by community moderators. - If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. - Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. - In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. -

+ thank_you_for_contribution: | +

Success! You did it! Hooray!

+
+

Thank you so much for contributing open research and being part of our community.

+

Here's what's happening now:

+
+

Your first contribution is awaiting approval by community moderators. + If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. + Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. + In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. +

thank_you_for_question: "Success! Thank you for contributing with a question, and thanks for your patience while your question is approved by community moderators and we'll email you when it is published." - question_note_published: "Question published. In the meantime, if you have more + question_note_published: "Question published. In the meantime, if you have more to contribute, feel free to do so." research_note_published: "Research note published. Get the word out on the discussion lists!" From ab8c23e90aa3d5a6a9cbed02c733639d66a623c0 Mon Sep 17 00:00:00 2001 From: Cess Date: Mon, 31 Oct 2022 21:25:27 +0300 Subject: [PATCH 5/9] Update en.yml --- config/locales/en.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 035dc74c37..940eaca914 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1139,11 +1139,7 @@ en:

Thank you so much for contributing open research and being part of our community.

Here's what's happening now:

-

Your first contribution is awaiting approval by community moderators. - If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. - Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. - In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. -

+

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

thank_you_for_question: "Success! Thank you for contributing with a question, and thanks for your patience while your question is approved by community moderators and we'll email you when it is published." From f42cd67a3a4d57d04299126d5954f311729de991 Mon Sep 17 00:00:00 2001 From: Tilda Udufo Date: Thu, 10 Nov 2022 22:35:02 +0100 Subject: [PATCH 6/9] Update en.yml --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 940eaca914..def698224d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1143,7 +1143,7 @@ en: thank_you_for_question: "Success! Thank you for contributing with a question, and thanks for your patience while your question is approved by community moderators and we'll email you when it is published." - question_note_published: "Question published. In the meantime, if you have more + question_note_published: "Question published. In the meantime, if you have more to contribute, feel free to do so." research_note_published: "Research note published. Get the word out on the discussion lists!" From 07a6afec1ae7bf8a1b301189a79454606d58a192 Mon Sep 17 00:00:00 2001 From: Tilda Udufo Date: Thu, 10 Nov 2022 22:52:37 +0100 Subject: [PATCH 7/9] Update notes_controller_test.rb --- test/functional/notes_controller_test.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb index d6376ddf25..f42549a88f 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/functional/notes_controller_test.rb @@ -315,11 +315,8 @@ def teardown

Thank you so much for contributing open research and being part of our community.

Here's what's happening now:

-

Your first contribution is awaiting approval by community moderators. - If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. - Thank you for your patience, in the next hours your contribution should be public. We'll email you when it is published. - In the meantime, if you have more to contribute, feel free to do so. Visit the Welcome Page to discover more ways to connect. -

", flash[:notice] +

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

+ ", flash[:notice] assert_nil flash[:warning] # no double notice assert_equal 4, Node.last.status assert_equal title, Node.last.title From 7c5d33c003d3a39569d2c93b3a915a3062f74502 Mon Sep 17 00:00:00 2001 From: Tilda Udufo Date: Thu, 10 Nov 2022 23:02:22 +0100 Subject: [PATCH 8/9] Update notes_controller_test.rb --- test/functional/notes_controller_test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb index f42549a88f..990a28b6cc 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/functional/notes_controller_test.rb @@ -315,8 +315,7 @@ def teardown

Thank you so much for contributing open research and being part of our community.

Here's what's happening now:

-

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

- ", flash[:notice] +

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

", flash[:notice] assert_nil flash[:warning] # no double notice assert_equal 4, Node.last.status assert_equal title, Node.last.title From 7396ba6ef9c9746e8613fb72273cfd2ddbc53490 Mon Sep 17 00:00:00 2001 From: Cess Date: Sun, 22 Jan 2023 00:32:05 +0300 Subject: [PATCH 9/9] use line breaks inline --- test/functional/notes_controller_test.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb index 990a28b6cc..cadff06082 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/functional/notes_controller_test.rb @@ -309,13 +309,7 @@ def teardown tags: 'balloon-mapping,event' } # , :main_image => "/images/testimage.jpg" - - assert_equal "

Success! You did it! Hooray!

-
-

Thank you so much for contributing open research and being part of our community.

-

Here's what's happening now:

-
-

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

", flash[:notice] + assert_equal "

Success! You did it! Hooray!

\n
\n

Thank you so much for contributing open research and being part of our community.

\n

Here's what's happening now:

\n
\n

Your first contribution is awaiting approval by community moderators. If you have asked an urgent question about an environmental concern, we will prioritize reviewing it. 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 Welcome Page to discover more ways to connect.

\n", flash[:notice] assert_nil flash[:warning] # no double notice assert_equal 4, Node.last.status assert_equal title, Node.last.title