Merge branch 'processing:develop' into develop

Author: code4humanity

client/components/Nav.jsx

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

client/i18n.js

@@ -11,7 +11,8 @@ import {
   frCA,
   zhCN,
   zhTW,
-  uk
+  uk,
+  sv
 } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
@@ -23,6 +24,7 @@ const availableLanguages = [
   'hi',
   'ja',
   'pt-BR',
+  'sv',
   'uk-UA',
   'zh-CN',
   'zh-TW'
@@ -37,6 +39,7 @@ export function languageKeyToLabel(lang) {
     hi: 'हिन्दी',
     ja: '日本語',
     'pt-BR': 'Português',
+    sv: 'Svenska',
     'uk-UA': 'Українська',
     'zh-CN': '简体中文',
     'zh-TW': '正體中文'
@@ -53,6 +56,7 @@ export function languageKeyToDateLocale(lang) {
     hi,
     ja,
     'pt-BR': ptBR,
+    sv,
     'uk-UA': uk,
     'zh-CN': zhCN,
     'zh-TW': zhTW

client/modules/App/App.jsx

@@ -7,6 +7,13 @@ import { setPreviousPath } from '../IDE/actions/ide';
 import { setLanguage } from '../IDE/actions/preferences';
 import CookieConsent from '../User/components/CookieConsent';
 
+function hideCookieConsent(pathname) {
+  if (pathname.includes('/full/') || pathname.includes('/embed/')) {
+    return true;
+  }
+  return false;
+}
+
 class App extends React.Component {
   constructor(props, context) {
     super(props, context);
@@ -40,9 +47,10 @@ class App extends React.Component {
   }
 
   render() {
+    const hide = hideCookieConsent(this.props.location.pathname);
     return (
       <div className="app">
-        <CookieConsent />
+        <CookieConsent hide={hide} />
         {this.state.isMounted &&
           !window.devToolsExtension &&
           getConfig('NODE_ENV') === 'development' && <DevTools />}