Merge pull request #2069 from codebar/update-copy-from-feedback

Some copy amends based on feedback from a marketing person

app/views/chapter/show.html.haml

@@ -19,7 +19,7 @@
         - if logged_in?
           = render partial: 'subscriptions'
         - else
-          = link_to 'Sign up', new_member_path, class: 'btn btn-primary'
+          = link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary'
 
 .container.py-4.py-lg-5
   .row

app/views/dashboard/show.html.haml

@@ -7,7 +7,7 @@
   .container.d-flex
     .col-md-5.offset-md-1.p-3.text
       %p.lead.mb-0= raw t('homepage.intro')
-      = link_to ('Sign up'), new_member_path, class: 'btn btn-primary btn-lg mt-4'
+      = link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary btn-lg mt-4'
 
 .py-4.py-lg-5.bg-light
   .container

app/views/dashboard/wall_of_fame.html.haml

@@ -5,7 +5,7 @@
       %p.lead
         Here you can find a list of the #{ @coaches_count } volunteers who have coached at codebar.
       %p.lead.mb-4
-        If you’d like to start coaching at a workshop near you, read our #{ link_to "teaching guide", teaching_guide_path } and then #{ link_to "sign up", new_member_path } as a coach. It’s easier than you think!
+        If you’d like to start coaching at a workshop in person or virtually, read our #{ link_to "teaching guide", teaching_guide_path } and then #{ link_to "join us", new_member_path } as a coach. It’s easier than you think!
     .col-12
       .float-right
         %ul.list-inline

app/views/events/_event_actions.html.haml

@@ -14,7 +14,7 @@
           = link_to event_coach_rsvp_path(@event), class: 'btn btn-primary' do
             = t('events.attend_as_coach')
       - else
-        = link_to 'Sign up', new_member_path, class: 'btn btn-primary me-2'
+        = link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary me-2'
         = link_to 'Log in', login_path, class: 'btn btn-primary'
   - else
     %p.badge.bg-primary= t('events.not_open_for_rsvp')

app/views/invitations/show.html.haml

@@ -15,7 +15,7 @@
       - if @invitation.for_student?
         - if [email protected]
           - if @member.already_attending(@event)
-            %p You have already RSVP'd to this event as a coach! Please cancel through the email confirmation you received if you wish to sign up as a student instead.
+            %p You have already RSVP'd to this event as a coach! Please cancel through the email confirmation you received if you wish to join us as a student instead.
           - else
             - if @event.event_student_spaces?
               - if @event.tito_url.present?

app/views/meetings/_meeting_actions.html.haml

@@ -41,5 +41,5 @@
         %strong This event is not open for RSVP.
 
   - else
-    = link_to 'Sign up', new_member_path, class: 'btn btn-primary'
+    = link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary'
     = link_to 'Log in', login_path, class: 'btn btn-primary'

app/views/workshops/_actions.html.haml

@@ -30,5 +30,5 @@
 
 - elsif not logged_in?
   %div
-    = link_to 'Sign up', new_member_path, class: 'btn btn-primary'
+    = link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary'
     = link_to 'Log in', login_path, class: 'btn btn-primary'

config/locales/de.yml

@@ -52,12 +52,12 @@ de:
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from a variety of backgrounds. Some want to become full-time developers, whereas some would like to learn the basics of coding in a supportive environment."
-      students_explanation_p2: "Sign up to join our vibrant community and attend our workshops."
-      students_button: "Sign up as a student"
+      students_explanation_p2: "Join our vibrant community and attend our workshops."
+      students_button: "Join us as a student"
       coaches_title: "Coaches"
       coaches_explanation_p1: "We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git <a href='http://tutorials.codebar.io'>tutorials</a>. We also help them understand programming concepts."
       coaches_explanation_p2: "Therefore we are always on the lookout for more developers to join our community and help coach at our workshops."
-      coaches_button: "Sign up as a coach"
+      coaches_button: "Join us as a coach"
       workshop_title: "Workshops"
       workshop_explanation_p1: "We are hosted by some amazing companies who support our cause. Our normal format is 30 minutes of socialising with food and drink, followed by a lightning talk then coding."
       workshop_explanation_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops.

config/locales/en.yml

@@ -86,12 +86,12 @@ en:
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from a variety of backgrounds. Some want to become full-time developers, whereas some would like to learn the basics of coding in a supportive environment."
-      students_explanation_p2: "Sign up to join our vibrant community and attend our workshops."
-      students_button: "Sign up as a student"
+      students_explanation_p2: "Join our vibrant community and attend our workshops."
+      students_button: "Join us as a student"
       coaches_title: "Coaches"
       coaches_explanation_p1: "We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git <a href='http://tutorials.codebar.io'>tutorials</a>. We also help them understand programming concepts."
       coaches_explanation_p2: "Therefore we are always on the lookout for more developers to join our community and help coach at our workshops."
-      coaches_button: "Sign up as a coach"
+      coaches_button: "Join us as a coach"
       workshop_title: "Workshops"
       workshop_explanation_p1: "We are hosted by some amazing companies who support our cause. Our normal format is 30 minutes of socialising with food and drink, followed by a lightning talk then coding."
       workshop_explanation_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops.
@@ -180,7 +180,7 @@ en:
     already_invited: 'You have already RSVPd or joined the waitlist for this workshop.'
     already_taken_place: 'This event has already taken place'
     rejected_invitation: "We are so sad you can't make it, but thanks for letting us know %{name}."
-    already_rsvped: "You have already confirmed you attendance!"
+    already_rsvped: "You have already confirmed your attendance!"
     not_attending_already: "You have already confirmed you can't make it!"
     no_available_seats: "There are no more spots left for this event, but you can join the waiting list."
     feedback_saved: "Thank you for taking the time to give us feedback!"
@@ -333,18 +333,18 @@ en:
     community_partner_title: Community partners
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student*"
+    sign_up_as_student: "Join us as a student*"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"
       students:
         intro: "If you would like to attend as a student, make sure you meet our"
         criteria_link: "eligibility criteria"
-        criteria_brief: "as our workshops are only available to women, LGBTQ, people from underrepresented minority groups."
+        criteria_brief: "as our workshops are only available to women, non-binary, LGBTQ, and people from underrepresented minority groups."
         github: "Lastly, when you click the sign up button, you'll be taken to something called GitHub. After logging in with a GitHub account, you'll be taken back to the codebar website. If you don't have an account yet, you'll need to create one. It doesn't take long and it's something that will come in handy when you get started with coding!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   terms_and_conditions:
@@ -426,7 +426,7 @@ en:
       description: "We want to ensure that our workshops are as accessible as possible. If you are disabled and are unsure about whether our venues can cater to your needs, we encourage you to please get in touch with us at <a href='mailto:[email protected]'>[email protected]</a> and we will do what we can to accommodate you."
   chapters:
     intro_html: "Hi and welcome to codebar!"
-    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started."
+    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Join our community button to join us."
     sign_up: "to be invited to our workshops."
     no_incoming: "There are no workshops coming up."
     contact: "To contact the %{city} team, send an email to %{email}"

config/locales/en_AU.yml

@@ -52,12 +52,12 @@ en-AU:
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from a variety of backgrounds. Some want to become full-time developers, whereas some would like to learn the basics of coding in a supportive environment."
-      students_explanation_p2: "Sign up to join our vibrant community and attend our workshops."
-      students_button: "Sign up as a student"
+      students_explanation_p2: "Join our vibrant community and attend our workshops."
+      students_button: "Join us as a student"
       coaches_title: "Coaches"
       coaches_explanation_p1: "We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git <a href='http://tutorials.codebar.io'>tutorials</a>. We also help them understand programming concepts."
       coaches_explanation_p2: "Therefore we are always on the lookout for more developers to join our community and help coach at our workshops."
-      coaches_button: "Sign up as a coach"
+      coaches_button: "Join us as a coach"
       workshop_title: "Workshops"
       workshop_explanation_p1: "We are hosted by some amazing companies who support our cause. Our normal format is 30 minutes of socialising with food and drink, followed by a lightning talk then coding."
       workshop_explanation_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops.
@@ -88,7 +88,7 @@ en-AU:
     already_invited: 'You have already RSVPd or joined the waitlist for this workshop.'
     error_blank_note: 'You must select a note'
     rejected_invitation: "We are so sad you can't make it, but thanks for letting us know %{name}."
-    already_rsvped: "You have already confirmed you attendance!"
+    already_rsvped: "You have already confirmed your attendance!"
     not_attending_already: "You have already confirmed you can't make it!"
     no_available_seats: "Unfortunately there are no more spaces left :(. If you would like to join our waiting list send us an email at %{email}"
     feedback_saved: "Thank you for taking the time to give us feedback!"
@@ -219,18 +219,18 @@ en-AU:
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"
       students:
         intro: "If you would like to attend as a student, make sure you meet our"
         criteria_link: "eligibility criteria"
-        criteria_brief: "as our workshops are only available to women, LGBTQ, people from underrepresented minority groups."
+        criteria_brief: "as our workshops are only available to women, non-binary, LGBTQ, and people from underrepresented minority groups."
         github: "Lastly, when you click the sign up button, you'll be taken to something called GitHub. After logging in with a GitHub account, you'll be taken back to the codebar website. If you don't have an account yet, you'll need to create one. It doesn't take long and it's something that will come in handy when you get started with coding!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
@@ -305,7 +305,7 @@ en-AU:
       description: "We want to ensure that our workshops are as accessible as possible. If you are disabled and are unsure about whether our venues can cater to your needs, we encourage you to please get in touch with us at <a href='mailto:[email protected]'>[email protected]</a> and we will do what we can to accommodate you."
   chapters:
     intro_html: "Hi and welcome to codebar!"
-    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started."
+    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Join our community button to join us."
     sign_up: "to be invited to our workshops."
     no_incoming: "There are no workshops coming up."
     contact: "To contact the %{city} team, send an email to %{email}"

config/locales/en_GB.yml

@@ -52,12 +52,12 @@ en-GB:
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from a variety of backgrounds. Some want to become full-time developers, whereas some would like to learn the basics of coding in a supportive environment."
-      students_explanation_p2: "Sign up to join our vibrant community and attend our workshops."
-      students_button: "Sign up as a student"
+      students_explanation_p2: "Join our vibrant community and attend our workshops."
+      students_button: "Join us as a student"
       coaches_title: "Coaches"
       coaches_explanation_p1: "We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git <a href='http://tutorials.codebar.io'>tutorials</a>. We also help them understand programming concepts."
       coaches_explanation_p2: "Therefore we are always on the lookout for more developers to join our community and help coach at our workshops."
-      coaches_button: "Sign up as a coach"
+      coaches_button: "Join us as a coach"
       workshop_title: "Workshops"
       workshop_explanation_p1: "We are hosted by some amazing companies who support our cause. Our normal format is 30 minutes of socialising with food and drink, followed by a lightning talk then coding."
       workshop_explanation_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops.
@@ -88,7 +88,7 @@ en-GB:
     already_invited: 'You have already RSVPd or joined the waitlist for this workshop.'
     error_blank_note: 'You must select a note'
     rejected_invitation: "We are so sad you can't make it, but thanks for letting us know %{name}."
-    already_rsvped: "You have already confirmed you attendance!"
+    already_rsvped: "You have already confirmed your attendance!"
     not_attending_already: "You have already confirmed you can't make it!"
     no_available_seats: "Unfortunately there are no more spaces left :(. If you would like to join our waiting list send us an email at %{email}"
     feedback_saved: "Thank you for taking the time to give us feedback!"
@@ -219,18 +219,18 @@ en-GB:
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"
       students:
         intro: "If you would like to attend as a student, make sure you meet our"
         criteria_link: "eligibility criteria"
-        criteria_brief: "as our workshops are only available to women, LGBTQ, people from underrepresented minority groups."
+        criteria_brief: "as our workshops are only available to women, non-binary,  LGBTQ, and people from underrepresented minority groups."
         github: "Lastly, when you click the sign up button, you'll be taken to something called GitHub. After logging in with a GitHub account, you'll be taken back to the codebar website. If you don't have an account yet, you'll need to create one. It doesn't take long and it's something that will come in handy when you get started with coding!"
       invitations: "Invitations are sent out periodically, so don't worry if you don't receive one as soon as you register."
   footer:
@@ -305,7 +305,7 @@ en-GB:
       description: "We want to ensure that our events are as accessible as possible. For each venue we try to get accessibility information, however if you don't see any information on the relevant event page please get in touch with us at <a href='mailto:[email protected]'>[email protected]</a> and we will do what we can to accommodate you."
   chapters:
     intro_html: "Hi and welcome to codebar!"
-    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started."
+    info: "Check out our <a href='http://codebar.io/faq'>FAQ</a> page for any questions you might have, or email us at <a href='mailto:%{email}'>%{email}</a> if you can't find the answer you're looking for. Otherwise, click the Join our community button to get started."
     sign_up: "to be invited to our workshops."
     no_incoming: "There are no workshops coming up."
     contact: "To contact the %{city} team, send an email to %{email}"