Merge branch 'develop' into multiple-alerts

ericrosenbaum · web-flow · commit 18e35eff6081 · 2018-09-26T12:51:39.000-04:00
diff --git a/package.json b/package.json
@@ -101,7 +101,7 @@
     "scratch-paint": "0.2.0-prerelease.20180918203812",
     "scratch-render": "0.1.0-prerelease.20180918201144",
     "scratch-storage": "1.0.2",
-    "scratch-svg-renderer": "0.2.0-prerelease.20180907141232",
+    "scratch-svg-renderer": "0.2.0-prerelease.20180926143036",
     "scratch-vm": "0.2.0-prerelease.20180925190229",
     "selenium-webdriver": "3.6.0",
     "startaudiocontext": "1.2.1",
diff --git a/src/containers/language-selector.jsx b/src/containers/language-selector.jsx
@@ -13,11 +13,13 @@ class LanguageSelector extends React.Component {
         bindAll(this, [
             'handleChange'
         ]);
+        document.documentElement.lang = props.currentLocale;
     }
     handleChange (e) {
         const newLocale = e.target.value;
         if (this.props.supportedLocales.includes(newLocale)) {
             this.props.onChangeLanguage(newLocale);
+            document.documentElement.lang = newLocale;
         }
     }
     render () {

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,13 @@ class LanguageSelector extends React.Component {`
`13`	`13`	`bindAll(this, [`
`14`	`14`	`'handleChange'`
`15`	`15`	`]);`
	`16`	`+ document.documentElement.lang = props.currentLocale;`
`16`	`17`	`}`
`17`	`18`	`handleChange (e) {`
`18`	`19`	`const newLocale = e.target.value;`
`19`	`20`	`if (this.props.supportedLocales.includes(newLocale)) {`
`20`	`21`	`this.props.onChangeLanguage(newLocale);`
	`22`	`+ document.documentElement.lang = newLocale;`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`	`render () {`