Merge branch 'master' into develop

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/node:10.16.3
+      - image: cimg/node:lts
     steps:
       - checkout
       - run:

src/components/banner/Paypal.jsx

@@ -8,7 +8,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 const Paypal = props => {
   const { t } = props;
-  let localeStringShort = i18n.language.substring(0, 2);
+  let localeStringShort = i18n.language? i18n.language.substring(0, 2): "en";
   let localeStringComplete =
     localeStringShort.toLowerCase() + "_" + localeStringShort.toUpperCase();
   if (localeStringComplete === "en_EN") {

src/components/layouts/LanguageSelector.jsx

@@ -12,7 +12,7 @@ const LanguageSelector = () => {
     i18n.changeLanguage(locale);
   };
 
-  let locale = i18n.language.substring(0, 2).toUpperCase();
+  let locale = i18n.language? i18n.language.substring(0, 2).toUpperCase() : "EN";
   if (locale === "EN") locale = "GB";
   return (
     <ReactFlagsSelect

src/i18n.jsx

@@ -12,7 +12,7 @@ i18n
     debug: true,
     saveMissing: true, // send not translated keys to endpoint
     defaultValue: "__STRING_NOT_TRANSLATED__",
-
+    react: { useSuspense: false },
     keySeparator: ">",
     nsSeparator: "|",
     backend: {