Merge pull request #1072 from LLK/release/2.2.15

[Master] Release 2.2.15

.gitignore

@@ -18,3 +18,7 @@ npm-*
 !.elasticbeanstalk/*.global.yml
 deploy.zip
 ENV
+
+# Test
+/.nyc_output
+/coverage

Makefile

@@ -19,7 +19,6 @@ clean:
 	mkdir -p build
 	mkdir -p intl
 
-
 deploy:
 	@make build
 	@make sync
@@ -52,13 +51,7 @@ start:
 test:
 	@make lint
 	@make build
-	@echo ""
-	@make unit
-	@echo ""
-	@make functional
-	@echo ""
-	@make localization
-	@echo ""
+	@make tap
 
 lint:
 	$(ESLINT) . --ext .js,.jsx,.json
@@ -77,6 +70,12 @@ integration:
 localization:
 	$(TAP) ./test/localization/*.js
 
+tap:
+	$(TAP) ./test/{unit,functional,localization}/*.js
+
+coverage:
+	$(TAP) ./test/{unit,functional,localization}/*.js --coverage --coverage-report=lcov
+
 # ------------------------------------
 
-.PHONY: build clean deploy translations webpack stop start test lint unit functional integration localization
+.PHONY: build clean deploy translations webpack start test lint unit functional integration localization tap coverage

README.md

@@ -2,6 +2,9 @@
 #### Standalone web client for Scratch
 
 [![Build Status](https://travis-ci.org/LLK/scratch-www.svg)](https://travis-ci.org/LLK/scratch-www)
+[![Coverage Status](https://coveralls.io/repos/github/LLK/scratch-www/badge.svg?branch=develop)](https://coveralls.io/github/LLK/scratch-www?branch=develop)
+[![dependencies Status](https://david-dm.org/llk/scratch-www/status.svg)](https://david-dm.org/llk/scratch-www)
+[![devDependencies Status](https://david-dm.org/llk/scratch-www/dev-status.svg)](https://david-dm.org/llk/scratch-www?type=dev)
 
 ### Where am I?
 Physically? No idea.

languages.json

@@ -30,6 +30,7 @@
     "he": "עִבְרִית",
     "hi": "हिन्दी",
     "hr": "Hrvatski",
+    "zu": "isiZulu",
     "is": "Íslenska",
     "it": "Italiano",
     "kn": "ಭಾಷೆ-ಹೆಸರು",

package.json

@@ -87,11 +87,18 @@
     "slick-carousel": "1.5.8",
     "source-map-support": "0.3.2",
     "style-loader": "0.12.3",
-    "tap": "2.0.0",
+    "tap": "7.1.2",
     "url-loader": "0.5.6",
     "watch": "0.16.0",
     "webpack": "1.12.14",
     "webpack-dev-middleware": "1.2.0",
     "xhr": "2.2.0"
+  },
+  "nyc": {
+    "include": [
+        "bin/**/*.js",
+        "src/**/*.js"
+    ],
+    "all": true
   }
 }

src/components/registration/steps.jsx

@@ -457,7 +457,7 @@ module.exports = {
         onValidSubmit: function (formData, reset, invalidate) {
             if (!formData.phone || formData.phone.national_number === '+') {
                 return invalidate({
-                    'phone': this.props.intl.formatMessage({id: 'teacherRegistration.validationPhoneNumber'})
+                    'phone': this.props.intl.formatMessage({id: 'teacherRegistration.validationRequired'})
                 });
             }
             return this.props.onNextStep(formData);

src/views/privacypolicy/privacypolicy.jsx

@@ -125,7 +125,7 @@ var Privacypolicy = React.createClass({
                                 If we detect repeated abusive behavior from your account, IP address,
                                  or email address, we may share your account name, IP address, and the
                                  time and content of the abusive behavior with the IP address owner
-                                 (such as a school or internet service provided).
+                                 (such as a school or internet service provider).
                             </li>
                             <li>
                                 We may use de-identified location, age, gender, and usage data
@@ -156,6 +156,12 @@ var Privacypolicy = React.createClass({
                                     </li>
                                 </ul>
                             </li>
+                            <li>
+                                Scratch reserves the right to share user information with the
+                                 appropriate authorities (including schools, school districts,
+                                 and law enforcement, when necessary) for the purposes of protecting
+                                 the safety of users, other individuals, or the security of the site.
+                            </li>
                         </ul>
                     </section>
                     <section id="update">
@@ -203,7 +209,7 @@ var Privacypolicy = React.createClass({
                              Policy on a regular basis.
                         </p>
                     </section>
-                    <p>The Scratch Privacy Policy was last updated: October 2016</p>
+                    <p>The Scratch Privacy Policy was last updated: November 2016</p>
                 </div>
                 <nav>
                     <ol>