Merge pull request #1000 from TheGrits/patch-5

Fix gh-997: Update General and Teacher FAQs

src/views/faq/faq.jsx

@@ -195,6 +195,8 @@ var Faq = injectIntl(React.createClass({
                             <dd><FormattedHTMLMessage id='faq.edBody' /></dd>
                             <dt><FormattedMessage id='faq.dataTitle' /></dt>
                             <dd><FormattedMessage id='faq.dataBody' /></dd>
+                            <dt><FormattedMessage id='faq.lawComplianceTitle' /></dt>
+                            <dd><FormattedMessage id='faq.lawComplianceBody' /></dd>
                         </dl>
                         <i><FormattedHTMLMessage id='faq.schoolsMoreInfo' /></i>
                     </section>

src/views/faq/l10n.json

@@ -136,5 +136,7 @@
     "faq.edBody":"Scratch Teacher Accounts are special user accounts on Scratch that have access to additional features to facilitate the creation and management of student accounts. ScratchEd Accounts are accounts on the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd community</a>, a separate website (managed by the Harvard Graduate School of Education) where educators share stories, exchange resources, ask questions, and meet other Scratch educators.",
     "faq.dataTitle":"What data does Scratch collect about students?",
     "faq.dataBody":"When a student first signs up on Scratch, we ask for basic demographic data including gender, age (birth month and year), country, and an email address for verification. This data is used (in aggregated form) in research studies intended to improve our understanding of how people learn with Scratch. When an educator uses a Scratch Teacher Account to create student accounts in bulk, no student demographic data is required for account setup.",
+    "faq.lawComplianceTitle":"Is Scratch 2.0 (online version) compliant with local and federal data privacy laws?",
+    "faq.lawComplianceBody":"Scratch cares deeply about the privacy of students and of all individuals who use our platform. We have in place physical and electronic procedures to protect the information we collect on the Scratch website. Although we are not in a position to offer contractual guarantees with each entity that uses our free educational product, we are in compliance with all federal laws that are applicable to MIT, a 501(c)(3) organization and the entity that created and maintains Scratch. We encourage you to read the Scratch Privacy Policy for more information.",
     "faq.schoolsMoreInfo":"For more more questions about Teacher Accounts, see the <a href=\"/educators/faq\">Teacher Account FAQ</a>"
 }

src/views/teachers/faq/faq.jsx

@@ -58,6 +58,10 @@ var TeacherFaq = injectIntl(React.createClass({
                             <dd><FormattedHTMLMessage id='teacherfaq.studentMultipleBody' /></dd>
                             <dt><FormattedMessage id='teacherfaq.studentDiscussTitle' /></dt>
                             <dd><FormattedHTMLMessage id='teacherfaq.studentDiscussBody' /></dd>
+                            <dt><FormattedMessage id='teacherfaq.studentDataTitle' /></dt>
+                            <dd><FormattedMessage id='teacherfaq.studentDataBody' /></dd>
+                            <dt><FormattedMessage id='teacherfaq.studentPrivacyLawsTitle' /></dt>
+                            <dd><FormattedMessage id='teacherfaq.studentPrivacyLawsBody' /></dd>
                         </dl>
                     </section>
                     <section id="community">

src/views/teachers/faq/l10n.json

@@ -34,6 +34,10 @@
     "teacherfaq.studentMultipleBody": "A student can only be a part of one class. However, we are looking into adding this functionality in later versions.",
     "teacherfaq.studentDiscussTitle": "Is there a space to discuss Teacher Accounts with other teachers?",
     "teacherfaq.studentDiscussBody": "Yes, you can engage in discussions with other teachers at <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd</a>, an online community for Scratch educators. Check out their forums to join conversations about a <a href=\"http://scratched.gse.harvard.edu/discussions\">number of topics</a>, including but not limited to Teacher Accounts. ScratchEd is developed and supported by the Harvard Graduate School of Education.",
+    "teacherfaq.studentDataTitle": "What data does Scratch collect about students?",
+    "teacherfaq.studentDataBody": "When a student first signs up on Scratch, we ask for basic demographic data including gender, age (birth month and year), country, and an email address for verification. This data is used (in aggregated form) in research studies intended to improve our understanding of how people learn with Scratch. When an educator uses a Scratch Teacher Account to create student accounts in bulk, no student demographic data is required for account setup.",
+    "teacherfaq.studentPrivacyLawsTitle": "Is Scratch 2.0 (online version) compliant with local and federal data privacy laws?",
+    "teacherfaq.studentPrivacyLawsBody": "Scratch cares deeply about the privacy of students and of all individuals who use our platform. We have in place physical and electronic procedures to protect the information we collect on the Scratch website. Although we are not in a position to offer contractual guarantees with each entity that uses our free educational product, we are in compliance with all federal laws that are applicable to MIT, a 501(c)(3) organization and the entity that created and maintains Scratch. We encourage you to read the Scratch Privacy Policy for more information.",
     
     "teacherfaq.commTitle": "Community",
     "teacherfaq.commHiddenTitle": "Can I create a hidden class?",