Merge develop, resolve merge conflicts

Author: catarak

client/components/Nav.jsx

@@ -671,40 +671,50 @@ class Nav extends React.PureComponent {
               <button
                 onFocus={this.handleFocusForLang}
                 onBlur={this.handleBlur}
-                value="zh-CN"
+                value="ja"
                 onClick={(e) => this.handleLangSelection(e)}
               >
-                简体中文
+                日本語
               </button>
             </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}
                 onBlur={this.handleBlur}
-                value="zh-TW"
+                value="pt-BR"
                 onClick={(e) => this.handleLangSelection(e)}
               >
-                正體中文
+                Português
               </button>
             </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}
                 onBlur={this.handleBlur}
-                value="ja"
+                value="uk-UA"
                 onClick={(e) => this.handleLangSelection(e)}
               >
-                日本語
+                Українська
               </button>
             </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}
                 onBlur={this.handleBlur}
-                value="pt-BR"
+                value="zh-CN"
                 onClick={(e) => this.handleLangSelection(e)}
               >
-                Português
+                简体中文
+              </button>
+            </li>
+            <li className="nav__dropdown-item">
+              <button
+                onFocus={this.handleFocusForLang}
+                onBlur={this.handleBlur}
+                value="zh-TW"
+                onClick={(e) => this.handleLangSelection(e)}
+              >
+                正體中文
               </button>
             </li>
           </ul>

client/i18n.js

@@ -1,7 +1,18 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
-import { enUS, es, ja, hi, ptBR, de, frCA, zhCN, zhTW } from 'date-fns/locale';
+import {
+  enUS,
+  es,
+  ja,
+  hi,
+  ptBR,
+  de,
+  frCA,
+  zhCN,
+  zhTW,
+  uk
+} from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
 const availableLanguages = [
@@ -12,6 +23,7 @@ const availableLanguages = [
   'hi',
   'ja',
   'pt-BR',
+  'uk-UA',
   'zh-CN',
   'zh-TW'
 ];
@@ -25,6 +37,7 @@ export function languageKeyToLabel(lang) {
     hi: 'हिन्दी',
     ja: '日本語',
     'pt-BR': 'Português',
+    'uk-UA': 'Українська',
     'zh-CN': '简体中文',
     'zh-TW': '正體中文'
   };
@@ -40,6 +53,7 @@ export function languageKeyToDateLocale(lang) {
     hi,
     ja,
     'pt-BR': ptBR,
+    'uk-UA': uk,
     'zh-CN': zhCN,
     'zh-TW': zhTW
   };

client/modules/IDE/components/PreviewFrame.jsx

@@ -24,8 +24,8 @@ function PreviewFrame({ fullView }) {
   const frameUrl = previewUrl;
   const sandboxAttributes = `allow-forms allow-modals allow-pointer-lock allow-popups 
     allow-same-origin allow-scripts allow-top-navigation-by-user-activation allow-downloads`;
-  const allow =
-    'accelerometer; autoplay; camera; encrypted-media; geolocation; gyroscope; microphone; magnetometer; midi; vr;';
+  const allow = `accelerometer; autoplay; camera; encrypted-media; geolocation;
+    gyroscope; microphone; magnetometer; midi; serial; vr;`;
   return (
     <Frame
       title="sketch preview"