Merge branch 'develop' into multiple-alerts

This commit is contained in:
Eric Rosenbaum authored and GitHub committed 2018-09-26 12:51:39 -04:00
commit 18e35eff60
2 files changed
+3 -1

No files matched your search

+1 -1
View File
@@ -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",
+2
View File
@@ -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 () {