Merge pull request #35715 from code-dot-org/international-pd-form-upd…

…ates Update international pd form in preparation for late-July Colombia teacher campaign
code-dot-org · Jul 9, 2020 · eca751b · eca751b
2 parents d6a97de + af4f995
commit eca751b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/apps/src/code-studio/pd/international_opt_in/InternationalOptIn.jsx b/apps/src/code-studio/pd/international_opt_in/InternationalOptIn.jsx
@@ -130,11 +130,11 @@ class InternationalOptInComponent extends FormComponent {
           type: 'text',
           required: true
         })}
-        {this.buildButtonsFromOptions({
+        {this.buildSelectFieldGroupFromOptions({
           name: 'schoolCountry',
           label: labels.schoolCountry,
-          type: 'radio',
-          required: true
+          required: true,
+          placeholder: i18n.selectAnOption()
         })}
         {this.buildButtonsFromOptions({
           name: 'ages',

diff --git a/dashboard/app/models/pd/international_opt_in.rb b/dashboard/app/models/pd/international_opt_in.rb
@@ -59,7 +59,7 @@ def self.options
       subjects: %w(cs ict math science history la efl music art other),
       resources: %w(bootstrap codecademy csfirst khan kodable lightbot scratch tynker other),
       robotics: %w(grok kodable lego microbit ozobot sphero raspberry wonder other),
-      workshopCourse: %w(csf_af csf_express csd csp),
+      workshopCourse: %w(csf_af csf_express csd csp not_applicable),
       emailOptIn: %w(opt_in_yes opt_in_no),
       legalOptIn: %w(opt_in_yes opt_in_no)
     }

diff --git a/dashboard/config/locales/en.yml b/dashboard/config/locales/en.yml
@@ -1097,6 +1097,7 @@ en:
         csf_express: 'CS Fundamentals (Pre-Express or Express)'
         csd: 'CS Discoveries'
         csp: 'CS Principles'
+        not_applicable: "Not applicable"
       email_opt_in:
         opt_in_yes: 'Yes'
         opt_in_no: 'No'
@@ -1105,6 +1106,9 @@ en:
       intro: "Thank you for taking time to receive training on Code.org’s curriculum. Our mission to bring computer science education opportunities to all children in all schools around the world would not be possible without you."
       instructions: "Please fill out the form below to indicate that 1) you attended a training workshop run by one of Code.org’s international partners, and 2) you agree to share your information with our international partner in your country so that they can help to support your journey as a computer science teacher."
       thanks_markdown: "Thank you for submitting! We look forward to supporting you as you get to know Code.org’s curriculum and tools. Please keep sharing your questions and feedback with us by writing to us at [support@code.org](%{support_email_url}) or by posting on the [teacher forum](%{teacher_forum_url})!"
+      facilitator_not_listed: "My facilitator is not listed"
+      facilitator_not_applicable: "Not applicable"
+      organizer_not_listed: "My organizer is not listed"
     logged_out:
       heading: 'Thanks for your interest in the Professional Learning Program!'
       body: 'To get started, you first need to be logged into your Code.org account. If you’d like more information about the program before you start your application, please check out the <a href="%{url}">Professional Learning Program overview</a>.'

diff --git a/dashboard/lib/international_opt_in_people.rb b/dashboard/lib/international_opt_in_people.rb
@@ -10,16 +10,18 @@ module InternationalOptInPeople
     "Rodrigo Fabrega",
     "Weena Naowaprateep",
     "Beth Zigmont & Hana Zimmerman Karl",
-    "My facilitator is not listed"
+    I18n.t('pd.international_opt_in.facilitator_not_listed'),
+    I18n.t('pd.international_opt_in.facilitator_not_applicable')
   ].freeze
 
   INTERNATIONAL_OPT_IN_PARTNERS = [
     "Aksorn",
+    "Computadores para Educar",
     "Cuantrix",
     "Fundacion Kodea",
     "Malaysia Digital Economy Corporation",
     "Mineduc",
     "Wix.com",
-    "My organizer is not listed"
+    I18n.t('pd.international_opt_in.organizer_not_listed')
   ].freeze
 end