From 4d2f9d7a05784ddeffce4edd9d05ad5a1ee7d288 Mon Sep 17 00:00:00 2001
From: Andrew Sliwinski <andrewsliwinski@acm.org>
Date: Wed, 20 Jul 2016 17:53:02 -0400
Subject: [PATCH 1/2] Educator page language adjustments as per feedback.
 Resolves GH-734

---
 src/views/teachers/landing/l10n.json   |  7 +++---
 src/views/teachers/landing/landing.jsx | 32 +++++++++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/teachers/landing/l10n.json b/src/views/teachers/landing/l10n.json
index 8e8ac23b1..011e3370f 100644
--- a/src/views/teachers/landing/l10n.json
+++ b/src/views/teachers/landing/l10n.json
@@ -1,15 +1,16 @@
 {
     "teacherlanding.title": "Scratch for Educators",
     "teacherlanding.intro": "Your students can use Scratch to code their own interactive stories, animations, and games. In the process, they learn to think creatively, reason systematically, and work collaboratively — essential skills for everyone in today’s society.",
-    "teacherlanding.inPracticeAnchor": "In Practice",
+    "teacherlanding.inPracticeAnchor": "Who Uses Scratch?",
     "teacherlanding.resourcesAnchor": "Resources",
     "teacherlanding.inPracticeTitle": "Who Uses Scratch?",
     "teacherlanding.inPracticeIntro": "Educators are using Scratch in a wide variety of: ",
     "teacherlanding.generalUsageSettings": "<b>Settings:</b> schools, museums, libraries, community centers",
     "teacherlanding.generalUsageGradeLevels": "<b>Grade Levels:</b> elementary, middle, and high school (and some colleges too!)",
     "teacherlanding.generalUsageSubjectAreas": "<b>Subject Areas:</b> language arts, science, social studies, math, computer science, foreign languages, and the arts",
-    "teacherlanding.ingridTitle": "Instructional Technology Specialist",
-    "teacherlanding.dylanTitle": "Educational Technologist",
+    "teacherlanding.elementaryTitle": "Elementary School",
+    "teacherlanding.middleTitle": "Middle School",
+    "teacherlanding.communityTitle": "Community Program",
     "teacherlanding.afterSchoolTitle": "After-School Program",
     "teacherlanding.resourcesTitle": "Educator Resources",
     "teacherlanding.scratchEdTitle": "A Community for Educators",
diff --git a/src/views/teachers/landing/landing.jsx b/src/views/teachers/landing/landing.jsx
index 62937e866..39a66e01e 100644
--- a/src/views/teachers/landing/landing.jsx
+++ b/src/views/teachers/landing/landing.jsx
@@ -62,34 +62,34 @@ var Landing = injectIntl(React.createClass({
                             <p><FormattedHTMLMessage id="teacherlanding.generalUsageSubjectAreas"/></p>
                         </FlexRow>
                         <FlexRow className="stories">
-                            <a href="//bit.ly/28SBsa9" className="story">
-                                    <img src="/images/teachers/stories/ingrid.jpg" alt="ingrid's story" />
-                                    <div className="story-info">
-                                         <p className="name">Ingrid Gustafson</p>
-                                         <p><FormattedMessage id="teacherlanding.ingridTitle" /></p>
-                                    </div>
-                            </a>
                             <a href="//bit.ly/28Q5l6P" className="story">
-                                <img src="/images/teachers/stories/dylan.jpg" alt="dylan's story" />
+                                <img src="/images/teachers/stories/dylan.jpg" alt="Elementary School" />
                                 <div className="story-info">
-                                    <p className="name">Dylan Ryder</p>
-                                    <p><FormattedMessage id="teacherlanding.dylanTitle" /></p>
+                                    <p className="name"><FormattedMessage id="teacherlanding.elementaryTitle" /></p>
+                                    <p>The School at Columbia University</p>
+                                </div>
+                            </a>
+                            <a href="//bit.ly/28SBsa9" className="story">
+                                <img src="/images/teachers/stories/ingrid.jpg" alt="Middle School" />
+                                <div className="story-info">
+                                    <p className="name"><FormattedMessage id="teacherlanding.middleTitle" /></p>
+                                    <p>Cambridge Public Schools</p>
                                 </div>
                             </a>
                             <a href="//bit.ly/28SC1AY" className="story">
                                 <img src="/images/teachers/stories/plug-in-studio.jpg"
-                                     alt="plug in studio's story" />
+                                     alt="Community-Based Program" />
                                  <div className="story-info">
-                                     <p className="name">Plug-In Studio</p>
-                                     <p><FormattedMessage id="teacherlanding.afterSchoolTitle" /></p>
+                                     <p className="name"><FormattedMessage id="teacherlanding.communityTitle" /></p>
+                                     <p>Plug-In Studio</p>
                                 </div>
                             </a>
                             <a href="//bit.ly/28UzapJ" className="story">
                                 <img src="/images/teachers/stories/ghana-code-club.jpg"
-                                     alt="ghana code club's story" />
+                                     alt="After-School Program" />
                                 <div className="story-info">
-                                     <p className="name">Ghana Code Club</p>
-                                     <p><FormattedMessage id="teacherlanding.afterSchoolTitle" /></p>
+                                     <p className="name"><FormattedMessage id="teacherlanding.afterSchoolTitle" /></p>
+                                     <p>Ghana Code Club</p>
                                 </div>
                             </a>
                         </FlexRow>

From 4f6c071c2c6fbf22c91eeea9066c9c00ae7d7891 Mon Sep 17 00:00:00 2001
From: Andrew Sliwinski <andrewsliwinski@acm.org>
Date: Thu, 21 Jul 2016 08:41:31 -0400
Subject: [PATCH 2/2] Pluralize example headlines on educators page

---
 src/views/teachers/landing/l10n.json   | 8 ++++----
 src/views/teachers/landing/landing.jsx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/teachers/landing/l10n.json b/src/views/teachers/landing/l10n.json
index 011e3370f..c4fd9ca41 100644
--- a/src/views/teachers/landing/l10n.json
+++ b/src/views/teachers/landing/l10n.json
@@ -8,10 +8,10 @@
     "teacherlanding.generalUsageSettings": "<b>Settings:</b> schools, museums, libraries, community centers",
     "teacherlanding.generalUsageGradeLevels": "<b>Grade Levels:</b> elementary, middle, and high school (and some colleges too!)",
     "teacherlanding.generalUsageSubjectAreas": "<b>Subject Areas:</b> language arts, science, social studies, math, computer science, foreign languages, and the arts",
-    "teacherlanding.elementaryTitle": "Elementary School",
-    "teacherlanding.middleTitle": "Middle School",
-    "teacherlanding.communityTitle": "Community Program",
-    "teacherlanding.afterSchoolTitle": "After-School Program",
+    "teacherlanding.elementaryTitle": "Elementary Schools",
+    "teacherlanding.middleTitle": "Middle Schools",
+    "teacherlanding.communityTitle": "Community Programs",
+    "teacherlanding.afterSchoolTitle": "After-School Programs",
     "teacherlanding.resourcesTitle": "Educator Resources",
     "teacherlanding.scratchEdTitle": "A Community for Educators",
     "teacherlanding.scratchEdDescription": "<a href=\"http://scratched.gse.harvard.edu/\">ScratchEd</a> is an online community where Scratch educators <a href=\"http://scratched.gse.harvard.edu/stories\">share stories</a>, exchange resources, ask questions, and find people. ScratchEd is developed and supported by the Harvard Graduate School of Education.",
diff --git a/src/views/teachers/landing/landing.jsx b/src/views/teachers/landing/landing.jsx
index 39a66e01e..fdb6222d6 100644
--- a/src/views/teachers/landing/landing.jsx
+++ b/src/views/teachers/landing/landing.jsx
@@ -63,14 +63,14 @@ var Landing = injectIntl(React.createClass({
                         </FlexRow>
                         <FlexRow className="stories">
                             <a href="//bit.ly/28Q5l6P" className="story">
-                                <img src="/images/teachers/stories/dylan.jpg" alt="Elementary School" />
+                                <img src="/images/teachers/stories/dylan.jpg" alt="Elementary Schools" />
                                 <div className="story-info">
                                     <p className="name"><FormattedMessage id="teacherlanding.elementaryTitle" /></p>
                                     <p>The School at Columbia University</p>
                                 </div>
                             </a>
                             <a href="//bit.ly/28SBsa9" className="story">
-                                <img src="/images/teachers/stories/ingrid.jpg" alt="Middle School" />
+                                <img src="/images/teachers/stories/ingrid.jpg" alt="Middle Schools" />
                                 <div className="story-info">
                                     <p className="name"><FormattedMessage id="teacherlanding.middleTitle" /></p>
                                     <p>Cambridge Public Schools</p>
@@ -78,7 +78,7 @@ var Landing = injectIntl(React.createClass({
                             </a>
                             <a href="//bit.ly/28SC1AY" className="story">
                                 <img src="/images/teachers/stories/plug-in-studio.jpg"
-                                     alt="Community-Based Program" />
+                                     alt="Community Programs" />
                                  <div className="story-info">
                                      <p className="name"><FormattedMessage id="teacherlanding.communityTitle" /></p>
                                      <p>Plug-In Studio</p>
@@ -86,7 +86,7 @@ var Landing = injectIntl(React.createClass({
                             </a>
                             <a href="//bit.ly/28UzapJ" className="story">
                                 <img src="/images/teachers/stories/ghana-code-club.jpg"
-                                     alt="After-School Program" />
+                                     alt="After-School Programs" />
                                 <div className="story-info">
                                      <p className="name"><FormattedMessage id="teacherlanding.afterSchoolTitle" /></p>
                                      <p>Ghana Code Club</p>