From 784698ab7e850243a1bbce89d0cdcf141576597c Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 8 May 2024 13:49:06 +0200 Subject: [PATCH 1/5] some copy amends based on feedback --- app/views/dashboard/show.html.haml | 2 +- config/locales/de.yml | 6 +++--- config/locales/en.yml | 10 +++++----- config/locales/en_AU.yml | 12 ++++++------ config/locales/en_GB.yml | 10 +++++----- config/locales/en_US.yml | 10 +++++----- config/locales/fi.yml | 4 ++-- config/locales/fr.yml | 6 +++--- config/locales/no.yml | 10 +++++----- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 8781df2ff..4e69d2f18 100644 --- a/app/views/dashboard/show.html.haml +++ b/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 ('Join the codebar community'), new_member_path, class: 'btn btn-primary btn-lg mt-4' .py-4.py-lg-5.bg-light .container diff --git a/config/locales/de.yml b/config/locales/de.yml index 71965f53a..558d014f6 100644 --- a/config/locales/de.yml +++ b/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 tutorials. 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. diff --git a/config/locales/en.yml b/config/locales/en.yml index 9a3ec3f7b..a4a380948 100644 --- a/config/locales/en.yml +++ b/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 tutorials. 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!" @@ -344,7 +344,7 @@ en: 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: diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml index b81547cea..dc2557229 100644 --- a/config/locales/en_AU.yml +++ b/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 tutorials. 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,7 +219,7 @@ 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_disclaimer: "* I understand and meet the eligibility criteria." @@ -230,7 +230,7 @@ en-AU: 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: diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 9c7669f72..0f740d442 100644 --- a/config/locales/en_GB.yml +++ b/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 tutorials. 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!" @@ -230,7 +230,7 @@ en-GB: 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: diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 34489d110..716ddec23 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -52,12 +52,12 @@ en-US: 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 tutorials. 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-US: 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!" @@ -228,7 +228,7 @@ en-US: 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: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index f1dc13e44..f001dc57d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -88,7 +88,7 @@ fi: 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!" @@ -230,7 +230,7 @@ fi: 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: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f1aad9556..03b21309e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -51,12 +51,12 @@ fr: 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 tutorials. 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. diff --git a/config/locales/no.yml b/config/locales/no.yml index aa87022dc..c26394961 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -52,12 +52,12 @@ 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 tutorials. 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 @@ 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!" @@ -230,7 +230,7 @@ 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: From 1190b8ad7681af432e39f8fb8dca744f02b16c36 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 8 May 2024 14:00:12 +0200 Subject: [PATCH 2/5] fix test --- app/views/invitations/show.html.haml | 2 +- config/locales/en.yml | 6 +++--- config/locales/en_AU.yml | 4 ++-- config/locales/en_GB.yml | 6 +++--- config/locales/en_US.yml | 6 +++--- config/locales/fi.yml | 12 ++++++------ config/locales/no.yml | 6 +++--- spec/features/accepting_terms_and_conditions_spec.rb | 12 ++++++------ spec/features/member_joining_spec.rb | 6 +++--- spec/features/subscribing_to_newsletter_spec.rb | 4 ++-- spec/features/visiting_homepage_spec.rb | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/views/invitations/show.html.haml b/app/views/invitations/show.html.haml index dfc9a6129..e7727670d 100644 --- a/app/views/invitations/show.html.haml +++ b/app/views/invitations/show.html.haml @@ -15,7 +15,7 @@ - if @invitation.for_student? - if !@invitation.attending - 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? diff --git a/config/locales/en.yml b/config/locales/en.yml index a4a380948..0ecf7c1b3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -333,11 +333,11 @@ 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" diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml index dc2557229..fd202c88c 100644 --- a/config/locales/en_AU.yml +++ b/config/locales/en_AU.yml @@ -221,9 +221,9 @@ en-AU: members: 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" diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 0f740d442..f4f353b03 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -219,11 +219,11 @@ 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" diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 716ddec23..76758c7a0 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -217,11 +217,11 @@ en-US: 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" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index f001dc57d..7428ad860 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -52,12 +52,12 @@ fi: 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 tutorials. 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. @@ -219,11 +219,11 @@ fi: 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" diff --git a/config/locales/no.yml b/config/locales/no.yml index c26394961..49576a81f 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -219,11 +219,11 @@ 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" diff --git a/spec/features/accepting_terms_and_conditions_spec.rb b/spec/features/accepting_terms_and_conditions_spec.rb index 98e31c1c1..18992f466 100644 --- a/spec/features/accepting_terms_and_conditions_spec.rb +++ b/spec/features/accepting_terms_and_conditions_spec.rb @@ -8,8 +8,8 @@ scenario 'they can''t proceed unless they accept the ToCs' do visit root_path - click_on 'Sign up as a student' - click_on 'Sign up as a student' + click_on 'Join us as a student' + click_on 'Join us as a student' expect(page).to have_current_path(terms_and_conditions_path) @@ -20,8 +20,8 @@ scenario 'they can read the Code of Conduct before accepting the ToCs', js: true do visit root_path - click_on 'Sign up as a student' - click_on 'Sign up as a student' + click_on 'Join us as a student' + click_on 'Join us as a student' expect(page).to have_current_path(terms_and_conditions_path) @@ -35,8 +35,8 @@ scenario 'they can fill in their details after they accept the ToCs' do visit root_path - click_on 'Sign up as a student' - click_on 'Sign up as a student' + click_on 'Join us as a student' + click_on 'Join us as a student' expect(page).to have_current_path(terms_and_conditions_path) diff --git a/spec/features/member_joining_spec.rb b/spec/features/member_joining_spec.rb index 9d4e2e6e8..3321e3b53 100644 --- a/spec/features/member_joining_spec.rb +++ b/spec/features/member_joining_spec.rb @@ -7,8 +7,8 @@ scenario 'A visitor can access signups through the landing page' do visit root_path - click_on 'Sign up as a student' - click_on 'Sign up as a student' + click_on 'Join us as a student' + click_on 'Join us as a student' accept_toc @@ -33,7 +33,7 @@ scenario 'A new member details are successfully captured' do visit new_member_path - click_on 'Sign up as a coach' + click_on 'Join us as a coach' accept_toc diff --git a/spec/features/subscribing_to_newsletter_spec.rb b/spec/features/subscribing_to_newsletter_spec.rb index e1ff7c2d3..276475814 100644 --- a/spec/features/subscribing_to_newsletter_spec.rb +++ b/spec/features/subscribing_to_newsletter_spec.rb @@ -20,7 +20,7 @@ expect(mailing_list).to receive(:subscribe).with('jane@codebar.io', 'Jane', 'Doe') visit new_member_path - click_on 'Sign up as a coach' + click_on 'Join us as a coach' accept_toc @@ -39,7 +39,7 @@ expect(mailing_list).to receive(:unsubscribe).with('jane@codebar.io') visit new_member_path - click_on 'Sign up as a coach' + click_on 'Join us as a coach' accept_toc diff --git a/spec/features/visiting_homepage_spec.rb b/spec/features/visiting_homepage_spec.rb index 1e9c693e5..06c412ae0 100644 --- a/spec/features/visiting_homepage_spec.rb +++ b/spec/features/visiting_homepage_spec.rb @@ -53,13 +53,13 @@ scenario 'i can sign up as a student' do visit root_path - expect(page).to have_content 'Sign up as a student' + expect(page).to have_content 'Join us as a student' end scenario 'i can sign up as a coach' do visit root_path - expect(page).to have_content 'Sign up as a coach' + expect(page).to have_content 'Join us as a coach' end end end From d0d59ab9ede9c554c31f9d69f1bd6bfa344ccd31 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 8 May 2024 16:20:29 +0200 Subject: [PATCH 3/5] more copy amends --- app/views/chapter/show.html.haml | 2 +- app/views/dashboard/wall_of_fame.html.haml | 2 +- config/locales/en.yml | 2 +- config/locales/en_AU.yml | 2 +- config/locales/en_GB.yml | 2 +- config/locales/en_US.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/no.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/chapter/show.html.haml b/app/views/chapter/show.html.haml index a529baa09..7be9162c0 100644 --- a/app/views/chapter/show.html.haml +++ b/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 'Join our community', new_member_path, class: 'btn btn-primary' .container.py-4.py-lg-5 .row diff --git a/app/views/dashboard/wall_of_fame.html.haml b/app/views/dashboard/wall_of_fame.html.haml index cacb1bc5f..0054b63de 100644 --- a/app/views/dashboard/wall_of_fame.html.haml +++ b/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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ecf7c1b3..e461ee10a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml index fd202c88c..fca56f727 100644 --- a/config/locales/en_AU.yml +++ b/config/locales/en_AU.yml @@ -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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index f4f353b03..5984deb7e 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 76758c7a0..6a13611b1 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -303,7 +303,7 @@ en-US: 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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7428ad860..7635ebfc2 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -305,7 +305,7 @@ fi: 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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" diff --git a/config/locales/no.yml b/config/locales/no.yml index 49576a81f..c2f52f429 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -305,7 +305,7 @@ 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 hello@codebar.io and we will do what we can to accommodate you." chapters: intro_html: "Hi and welcome to codebar!" - info: "Check out our FAQ page for any questions you might have, or email us at %{email} if you can't find the answer you're looking for. Otherwise, click the Sign up button to get started." + info: "Check out our FAQ page for any questions you might have, or email us at %{email} 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}" From 4d6bde82088d93d966fba4459d5a1602b9cbaae8 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Fri, 5 Jul 2024 14:35:34 +0200 Subject: [PATCH 4/5] update string to be consistent --- app/views/dashboard/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 4e69d2f18..923df37e8 100644 --- a/app/views/dashboard/show.html.haml +++ b/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 ('Join the codebar community'), new_member_path, class: 'btn btn-primary btn-lg mt-4' + = link_to ('Join our community'), new_member_path, class: 'btn btn-primary btn-lg mt-4' .py-4.py-lg-5.bg-light .container From ae6cab503f2be271b40673900d2657665ce59426 Mon Sep 17 00:00:00 2001 From: Kriszta Matyi Date: Mon, 12 Aug 2024 11:53:45 -0700 Subject: [PATCH 5/5] Standardize sing up button language and use translation strings --- app/views/chapter/show.html.haml | 2 +- app/views/dashboard/show.html.haml | 2 +- app/views/events/_event_actions.html.haml | 2 +- app/views/meetings/_meeting_actions.html.haml | 2 +- app/views/workshops/_actions.html.haml | 2 +- spec/features/view_event_spec.rb | 4 ++-- .../shared_examples/behaves_like_viewing_workshop_actions.rb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/chapter/show.html.haml b/app/views/chapter/show.html.haml index 7be9162c0..820efc786 100644 --- a/app/views/chapter/show.html.haml +++ b/app/views/chapter/show.html.haml @@ -19,7 +19,7 @@ - if logged_in? = render partial: 'subscriptions' - else - = link_to 'Join our community', 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 diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 923df37e8..5eddd5bc7 100644 --- a/app/views/dashboard/show.html.haml +++ b/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 ('Join our community'), 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 diff --git a/app/views/events/_event_actions.html.haml b/app/views/events/_event_actions.html.haml index 28f0e3cc6..aebcbc7d2 100644 --- a/app/views/events/_event_actions.html.haml +++ b/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') diff --git a/app/views/meetings/_meeting_actions.html.haml b/app/views/meetings/_meeting_actions.html.haml index 27b1ead0e..b8325de2a 100644 --- a/app/views/meetings/_meeting_actions.html.haml +++ b/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' diff --git a/app/views/workshops/_actions.html.haml b/app/views/workshops/_actions.html.haml index 3d6976ba0..a67ccb332 100644 --- a/app/views/workshops/_actions.html.haml +++ b/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' diff --git a/spec/features/view_event_spec.rb b/spec/features/view_event_spec.rb index 700b4447f..0e3d2716c 100644 --- a/spec/features/view_event_spec.rb +++ b/spec/features/view_event_spec.rb @@ -18,13 +18,13 @@ scenario 'a student cannot RSVP if they are not logged in' do expect(page).to have_link('Log in') - expect(page).to have_link('Sign up') + expect(page).to have_link('Join our community') expect(page).to_not have_link('Attend as a student') end scenario 'a coach cannot RSVP if they are not logged in' do expect(page).to have_link('Log in') - expect(page).to have_link('Sign up') + expect(page).to have_link('Join our community') expect(page).to_not have_link('Attend as a coach') end end diff --git a/spec/support/shared_examples/behaves_like_viewing_workshop_actions.rb b/spec/support/shared_examples/behaves_like_viewing_workshop_actions.rb index 4053b574e..db0ef2f6a 100644 --- a/spec/support/shared_examples/behaves_like_viewing_workshop_actions.rb +++ b/spec/support/shared_examples/behaves_like_viewing_workshop_actions.rb @@ -1,6 +1,6 @@ RSpec.shared_examples 'viewing workshop actions' do scenario 'signing up or signing in' do - expect(page).to have_content('Sign up') + expect(page).to have_content('Join our community') expect(page).to have_content('Log in') end end