Merge branch 'develop' into Ukrainian-Translation

Author: gtmizyuk

.prettierrc

@@ -14,5 +14,6 @@
   "tabWidth": 2,
   "trailingComma": "none",
   "useTabs": false,
-  "quoteProps": "as-needed"
+  "quoteProps": "as-needed",
+  "endOfLine":"auto"
 }

client/components/Nav.jsx

@@ -647,6 +647,16 @@ class Nav extends React.PureComponent {
                 Português
               </button>
             </li>
+            <li className="nav__dropdown-item">
+              <button
+                onFocus={this.handleFocusForLang}
+                onBlur={this.handleBlur}
+                value="de"
+                onClick={(e) => this.handleLangSelection(e)}
+              >
+                Deutsch
+              </button>
+            </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}

client/i18n.js

@@ -1,10 +1,10 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
-import { enUS, es, ja, hi, ptBR, uk } from 'date-fns/locale';
+import { enUS, es, ja, hi, ptBR, de, uk } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
-const availableLanguages = ['en-US', 'es-419', 'ja', 'hi', 'pt-BR', 'uk-UA'];
+const availableLanguages = ['en-US', 'es-419', 'ja', 'hi', 'pt-BR', 'de', 'uk-UA'];
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
@@ -13,6 +13,7 @@ export function languageKeyToLabel(lang) {
     ja: '日本語',
     hi: 'हिन्दी',
     'pt-BR': 'Português',
+    de: 'Deutsch',
     'uk-UA': 'Українська'
   };
   return languageMap[lang];
@@ -23,7 +24,8 @@ export function languageKeyToDateLocale(lang) {
     'en-US': enUS,
     'es-419': es,
     ja,
-    hi,  
+    hi,
+    de,
     'pt-BR': ptBR,
     'uk-UA': uk
   };

client/modules/User/pages/DashboardView.jsx

@@ -11,6 +11,7 @@ import AssetList from '../../IDE/components/AssetList';
 import AssetSize from '../../IDE/components/AssetSize';
 import CollectionList from '../../IDE/components/CollectionList';
 import SketchList from '../../IDE/components/SketchList';
+import * as ProjectActions from '../../IDE/actions/project';
 import {
   CollectionSearchbar,
   SketchSearchbar
@@ -29,6 +30,7 @@ class DashboardView extends React.Component {
   constructor(props) {
     super(props);
     this.closeAccountPage = this.closeAccountPage.bind(this);
+    this.createNewSketch = this.createNewSketch.bind(this);
     this.gotoHomePage = this.gotoHomePage.bind(this);
     this.toggleCollectionCreate = this.toggleCollectionCreate.bind(this);
     this.state = {
@@ -44,6 +46,10 @@ class DashboardView extends React.Component {
     browserHistory.push(this.props.previousPath);
   }
 
+  createNewSketch() {
+    this.props.newProject();
+  }
+
   gotoHomePage() {
     browserHistory.push('/');
   }
@@ -98,7 +104,9 @@ class DashboardView extends React.Component {
         return (
           <React.Fragment>
             {this.isOwner() && (
-              <Button to="/">{t('DashboardView.NewSketch')}</Button>
+              <Button onClick={this.createNewSketch}>
+                {t('DashboardView.NewSketch')}
+              </Button>
             )}
             <SketchSearchbar />
           </React.Fragment>
@@ -170,7 +178,12 @@ function mapStateToProps(state) {
   };
 }
 
+const mapDispatchToProps = {
+  ...ProjectActions
+};
+
 DashboardView.propTypes = {
+  newProject: PropTypes.func.isRequired,
   location: PropTypes.shape({
     pathname: PropTypes.string.isRequired
   }).isRequired,
@@ -185,4 +198,6 @@ DashboardView.propTypes = {
   t: PropTypes.func.isRequired
 };
 
-export default withTranslation()(connect(mapStateToProps)(DashboardView));
+export default withTranslation()(
+  connect(mapStateToProps, mapDispatchToProps)(DashboardView)
+);