From 96ef04ef62ac7703007e3afd5a7d6d95a8b434bf Mon Sep 17 00:00:00 2001 From: Kristian Hamilton Date: Thu, 6 Sep 2018 08:33:01 +0200 Subject: [PATCH 1/3] broken translation link causing error --- app/views/dashboard/code.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dashboard/code.html.haml b/app/views/dashboard/code.html.haml index c578f0507..bcbdda411 100644 --- a/app/views/dashboard/code.html.haml +++ b/app/views/dashboard/code.html.haml @@ -35,4 +35,4 @@ %p = t('code_of_conduct.content.questions') - =mail_to 'hello@codebar.io', t('code_of_conduct.content.contact'), subject: t('code_of_conduct.email_subject') + =mail_to 'hello@codebar.io', t('code_of_conduct.content.contact'), subject: t('code_of_conduct.content.email_subject') From 43c261621ecbc86350a745f532f2badf03b52db6 Mon Sep 17 00:00:00 2001 From: Kristian Hamilton Date: Thu, 6 Sep 2018 08:33:21 +0200 Subject: [PATCH 2/3] Add Homepage strings to translations locales --- app/views/dashboard/show.html.haml | 45 +++++++++++++++++------------- config/locales/en.yml | 20 +++++++++++++ 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index c46be25c7..47fc67808 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -2,14 +2,14 @@ .row .medium-offset-1.medium-6.columns %p.lead - codebar is a non-profit initiative that facilitates the growth of a diverse tech community by running regular programming workshops. + = raw t('homepage.intro') %section.testimonials .stripe .row .large-12.columns %p.lead - Our goal is to enable underrepresented people to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible. + = t('homepage.explaination') - if @testimonials.any? .row .large-offset-1.large-11.columns @@ -19,30 +19,36 @@ .row#showcase .large-4.columns .text-center - %h4 Students - %p 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. - %p Sign up to join our vibrant community and attend our workshops. - + %h4 + = t('homepage.participate.students_title') + %p + = t('homepage.participate.students_explaination_p1') + %p + = t('homepage.participate.students_explaination_p2') + .text-center - = link_to "Sign up as a student", new_member_path, class: 'button' + = link_to t("homepage.participate.students_button"), new_member_path, class: 'button' .large-4.columns .text-center - %h4 Coaches + %h4 + = t('homepage.participate.coaches_title') %p - We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git #{link_to "tutorials", "http://tutorials.codebar.io"}. We also help them understand programming concepts. - %p Therefore are always on the lookout for more developers to join our community and help coach at our workshops. + = raw t('homepage.participate.coaches_explaination_p1') + %p + = t('homepage.participate.coaches_explaination_p2') + .text-center - = link_to "Sign up as a coach", new_member_path, class: 'button' + = link_to t("homepage.participate.coaches_button"), new_member_path, class: 'button' .large-4.columns .text-center - %h4 Workshops + %h4 + = t('homepage.participate.workshop_title') %p - 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. + = t('homepage.participate.workshop_explaination_p1') %p - Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops. - + = t('homepage.participate.workshop_explaination_p2') .text-center - = mail_to "hello@codebar.io", "Host a workshop", class: 'button' + = mail_to "hello@codebar.io", t("homepage.participate.workshop_button"), subject: t('homepage.participate.workshop_email_subject'), class: 'button' %section.stripe#chapter .events#container @@ -50,9 +56,9 @@ .large-8.columns - if @upcoming_workshops.empty? %p - = t("no_upcoming_events") + = t("events.no_upcoming_events") %p - =link_to t("view_past_events"), events_url(anchor: 'past'), class: "button round expand" + =link_to t("events.view_past_events"), events_url(anchor: 'past'), class: "button round expand" - if @upcoming_workshops.any? - @upcoming_workshops.each do |date, workshops| @@ -60,7 +66,8 @@ %h4= date = render workshops .large-4.columns#chapters - %h3 Chapters + %h3 + = t("homepage.chapters.title") %ul.no-bullet - @chapters.each do |chapter| %li diff --git a/config/locales/en.yml b/config/locales/en.yml index ad1b791f5..d6eb9a2ae 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -37,6 +37,26 @@ en: workshop: "%A, %e %B %Y at %R" dashboard: "%A, %b %d" + homepage: + intro: "codebar is a non-profit initiative that facilitates the growth of a diverse tech community by running regular programming workshops." + explaination: "Our goal is to enable underrepresented people to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible." + participate: + students_title: "Students" + students_explaination_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_explaination_p2: "Sign up to join our vibrant community and attend our workshops." + students_button: "Sign up as a student" + coaches_title: "Coaches" + coaches_explaination_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_explaination_p2: "Therefore 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" + workshop_title: "Workshops" + workshop_explaination_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_explaination_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops. + workshop_button: "Host a workshop" + workshop_email_subject: "Regarding hosting a workshop" + chapters: + title: "Chapters" + messages: accepted_invitation: "Thanks for getting back to us %{name}. See you at the workshop!" rejected_invitation: "We are so sad you can't make it, but thanks for letting us know %{name}." From c014e6e4dda0ab43709bf1ea2e9da0dd29889972 Mon Sep 17 00:00:00 2001 From: Kristian Hamilton Date: Wed, 12 Sep 2018 11:20:48 +0200 Subject: [PATCH 3/3] correct spelling mistake --- app/views/dashboard/show.html.haml | 14 +++++++------- config/locales/en.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 47fc67808..a67967ecd 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -9,7 +9,7 @@ .row .large-12.columns %p.lead - = t('homepage.explaination') + = t('homepage.explanation') - if @testimonials.any? .row .large-offset-1.large-11.columns @@ -22,9 +22,9 @@ %h4 = t('homepage.participate.students_title') %p - = t('homepage.participate.students_explaination_p1') + = t('homepage.participate.students_explanation_p1') %p - = t('homepage.participate.students_explaination_p2') + = t('homepage.participate.students_explanation_p2') .text-center = link_to t("homepage.participate.students_button"), new_member_path, class: 'button' @@ -33,9 +33,9 @@ %h4 = t('homepage.participate.coaches_title') %p - = raw t('homepage.participate.coaches_explaination_p1') + = raw t('homepage.participate.coaches_explanation_p1') %p - = t('homepage.participate.coaches_explaination_p2') + = t('homepage.participate.coaches_explanation_p2') .text-center = link_to t("homepage.participate.coaches_button"), new_member_path, class: 'button' @@ -44,9 +44,9 @@ %h4 = t('homepage.participate.workshop_title') %p - = t('homepage.participate.workshop_explaination_p1') + = t('homepage.participate.workshop_explanation_p1') %p - = t('homepage.participate.workshop_explaination_p2') + = t('homepage.participate.workshop_explanation_p2') .text-center = mail_to "hello@codebar.io", t("homepage.participate.workshop_button"), subject: t('homepage.participate.workshop_email_subject'), class: 'button' diff --git a/config/locales/en.yml b/config/locales/en.yml index d6eb9a2ae..ffd0380b5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,19 +39,19 @@ en: homepage: intro: "codebar is a non-profit initiative that facilitates the growth of a diverse tech community by running regular programming workshops." - explaination: "Our goal is to enable underrepresented people to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible." + explanation: "Our goal is to enable underrepresented people to learn programming in a safe and collaborative environment and expand their career opportunities. To achieve this we run free regular workshops, regular one-off events and try to create opportunities for our students making technology and coding more accessible." participate: students_title: "Students" - students_explaination_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_explaination_p2: "Sign up to join our vibrant community and attend our workshops." + 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" coaches_title: "Coaches" - coaches_explaination_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_explaination_p2: "Therefore are always on the lookout for more developers to join our community and help coach at our workshops." + 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 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" workshop_title: "Workshops" - workshop_explaination_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_explaination_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our 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. workshop_button: "Host a workshop" workshop_email_subject: "Regarding hosting a workshop" chapters: