Merge branch 'develop' into feature/urdu-translation

Author: lindapaiste

client/i18n.js

@@ -44,7 +44,7 @@ export const availableLanguages = [
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
-    be: 'Bengali',
+    be: 'বাংলা',
     de: 'Deutsch',
     'en-US': 'English',
     'es-419': 'Español',

client/modules/User/pages/EmailVerificationView.jsx

@@ -1,32 +1,31 @@
-import PropTypes from 'prop-types';
-import React, { useEffect } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { withTranslation } from 'react-i18next';
+import React, { useEffect, useMemo } from 'react';
 import { Helmet } from 'react-helmet';
-import browserHistory from '../../../browserHistory';
+import { useLocation, useHistory } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
+import { useTranslation } from 'react-i18next';
 import { verifyEmailConfirmation } from '../actions';
 import RootPage from '../../../components/RootPage';
 import Nav from '../../IDE/components/Header/Nav';
 
-const EmailVerificationView = (props) => {
-  const { emailVerificationTokenState, location, t } = props;
-
-  const verificationTokenFromLocation = () => {
+const EmailVerificationView = () => {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const dispatch = useDispatch();
+  const browserHistory = useHistory();
+  const emailVerificationTokenState = useSelector(
+    (state) => state.user.emailVerificationTokenState
+  );
+  const verificationToken = useMemo(() => {
     const searchParams = new URLSearchParams(location.search);
     return searchParams.get('t');
-  };
-
+  }, [location.search]);
   useEffect(() => {
-    const verificationToken = verificationTokenFromLocation();
-    if (verificationToken != null) {
-      props.verifyEmailConfirmation(verificationToken);
+    if (verificationToken) {
+      dispatch(verifyEmailConfirmation(verificationToken));
     }
-  }, [location, props]);
-
+  }, [dispatch, verificationToken]);
   let status = null;
-
-  if (verificationTokenFromLocation() == null) {
+  if (!verificationToken) {
     status = <p>{t('EmailVerificationView.InvalidTokenNull')}</p>;
   } else if (emailVerificationTokenState === 'checking') {
     status = <p>{t('EmailVerificationView.Checking')}</p>;
@@ -54,39 +53,4 @@ const EmailVerificationView = (props) => {
     </RootPage>
   );
 };
-
-function mapStateToProps(state) {
-  return {
-    emailVerificationTokenState: state.user.emailVerificationTokenState
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return bindActionCreators(
-    {
-      verifyEmailConfirmation
-    },
-    dispatch
-  );
-}
-
-EmailVerificationView.defaultProps = {
-  emailVerificationTokenState: null
-};
-
-EmailVerificationView.propTypes = {
-  emailVerificationTokenState: PropTypes.oneOf([
-    'checking',
-    'verified',
-    'invalid'
-  ]),
-  verifyEmailConfirmation: PropTypes.func.isRequired,
-  t: PropTypes.func.isRequired,
-  location: PropTypes.shape({
-    search: PropTypes.string.isRequired
-  }).isRequired
-};
-
-export default withTranslation()(
-  connect(mapStateToProps, mapDispatchToProps)(EmailVerificationView)
-);
+export default EmailVerificationView;

client/modules/User/pages/SignupView.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
-import { useTranslation } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 import SignupForm from '../components/SignupForm';
 import SocialAuthButton from '../components/SocialAuthButton';
 import Nav from '../../IDE/components/Header/Nav';
@@ -27,9 +27,13 @@ function SignupView() {
             <SocialAuthButton service={SocialAuthButton.services.google} />
           </div>
           <p className="form__navigation-options">
-            By signing up, you agree to the p5.js Editor&apos;s{' '}
-            <Link to="/terms-of-use">Terms of Use</Link> and{' '}
-            <Link to="/privacy-policy">Privacy Policy</Link>.
+            <Trans
+              i18nKey="SignupView.Warning"
+              components={[
+                <Link to="/terms-of-use">Terms of use</Link>,
+                <Link to="/privacy-policy">Privacy Policy</Link>
+              ]}
+            />
           </p>
           <p className="form__navigation-options">
             {t('SignupView.AlreadyHave')}{' '}

translations/locales/en-US/translations.json

@@ -366,7 +366,8 @@
     "Description": "Sign Up",
     "Or": "Or",
     "AlreadyHave": "Already have an account?",
-    "Login": "Log In"
+    "Login": "Log In",
+    "Warning": "By signing up, you agree to the p5.js Editor's <0>Terms of Use</0> and <1>Privacy Policy.</1>"
   },
   "EmailVerificationView": {
     "Title": "p5.js Web Editor | Email Verification",

translations/locales/hi/translations.json

@@ -353,7 +353,8 @@
       "Description": "साइन अप",
       "Or": "या",
       "AlreadyHave": "पहले से ही अकाउंट है?",
-      "Login": "लॉग इन"
+      "Login": "लॉग इन",
+      "Warning": "साइन अप करके, आप p5.js संपादक की उपयोग की <0>शर्तों</0> और <1>गोपनीयता नीति</1> से सहमत होते हैं।"
     },
     "EmailVerificationView": {
       "Title": "p5.js वेब एडिटर | ईमेल वेरीफिकेशन",