From 0019c603df63275b18509653ba9e0815ba057156 Mon Sep 17 00:00:00 2001 From: Ufia Irene <89124723+UfiairENE@users.noreply.github.com> Date: Mon, 1 Nov 2021 13:39:35 +0100 Subject: [PATCH 1/2] fixed: codebase translation for signup page --- .../control/src/locales/en/translations.js | 2 +- packages/control/src/pages/signup/index.js | 91 +++---- .../control/src/translations/pages/Signup.js | 226 ++++++++++++++++++ packages/control/src/translator.js | 4 +- 4 files changed, 280 insertions(+), 43 deletions(-) create mode 100644 packages/control/src/translations/pages/Signup.js diff --git a/packages/control/src/locales/en/translations.js b/packages/control/src/locales/en/translations.js index 75a97d3f73..544e5594c7 100644 --- a/packages/control/src/locales/en/translations.js +++ b/packages/control/src/locales/en/translations.js @@ -504,7 +504,7 @@ export const TRANSLATIONS_EN = { emailAddress: "Email Address", emailAddressPlaceholder: "Enter you email address", password: "Password", - passwordPlaceholder: "Enter a password" + inputPassword: "Enter a password" } }, privacyAgreement: "I agree to Zuri Chat's", diff --git a/packages/control/src/pages/signup/index.js b/packages/control/src/pages/signup/index.js index 4da71e6841..2f56b19104 100644 --- a/packages/control/src/pages/signup/index.js +++ b/packages/control/src/pages/signup/index.js @@ -1,13 +1,13 @@ -import React, { useState, useEffect } from 'react' -import { withRouter, useHistory, Link } from 'react-router-dom' -import AuthInputBox from '../../components/AuthInputBox' -import FormWrapper from '../../components/AuthFormWrapper' -import styles from '../../component-styles/AuthFormElements.module.css' -import axios from 'axios' -import EmailVerification from './email-verify' -import { Helmet } from 'react-helmet'; -import "../../i18n"; -import { useTranslation} from "react-i18next"; +import React, { useState, useEffect } from "react" +import { withRouter, useHistory, Link } from "react-router-dom" +import AuthInputBox from "../../components/AuthInputBox" +import FormWrapper from "../../components/AuthFormWrapper" +import styles from "../../component-styles/AuthFormElements.module.css" +import axios from "axios" +import EmailVerification from "./email-verify" +import { Helmet } from "react-helmet" +import "../../i18n" +import { useTranslation } from "react-i18next" // import { Link } from 'react-router-dom' // import authBg1 from './assets/auth_bg1.svg' // import authBg2 from './assets/auth_bg2.svg' @@ -16,14 +16,14 @@ import { useTranslation} from "react-i18next"; // import authBg5 from './assets/auth_bg5.svg' const Signup = () => { - const [name, setName] = useState('') - const [email, setEmail] = useState('') - const [password, setPassword] = useState('') + const [name, setName] = useState("") + const [email, setEmail] = useState("") + const [password, setPassword] = useState("") const [tos, setTos] = useState(false) - const [error, seterror] = useState('') - const [nameerror, setnameerror] = useState('') - const [passworderror, setpassworderror] = useState('') - const [emailerror, setemailerror] = useState('') + const [error, seterror] = useState("") + const [nameerror, setnameerror] = useState("") + const [passworderror, setpassworderror] = useState("") + const [emailerror, setemailerror] = useState("") const [showDialog, setShowDialog] = useState(false) // Background Images @@ -74,9 +74,9 @@ const Signup = () => { } //Seperate user fullname - const seperateName = name.split(' ') - let first_name = '', - other_name = '' + const seperateName = name.split(" ") + let first_name = "", + other_name = "" seperateName.map((name, index) => { if (index === 0) { @@ -86,7 +86,7 @@ const Signup = () => { }) await axios - .post('https://api.zuri.chat/users', { + .post("https://api.zuri.chat/users", { first_name, last_name: other_name, email, @@ -98,9 +98,9 @@ const Signup = () => { setShowDialog(true) //Store token in localstorage - sessionStorage.setItem('user_id', data.InsertedId) - localStorage.setItem('newUserEmail', JSON.stringify(email)) - localStorage.setItem('userUserPassword', JSON.stringify(password)) + sessionStorage.setItem("user_id", data.InsertedId) + localStorage.setItem("newUserEmail", JSON.stringify(email)) + localStorage.setItem("userUserPassword", JSON.stringify(password)) //Display message // alert(message) //Change this when there is a design @@ -115,13 +115,13 @@ const Signup = () => { setShowDialog(false) RegExp(/Users with email/).test(data.message) && - setemailerror('This email is already in use') + setemailerror("This email is already in use") - !RegExp('Users with email').test(data.message) && seterror(data.message) + !RegExp("Users with email").test(data.message) && seterror(data.message) }) } - const { t } = useTranslation(); + const { t } = useTranslation() return (
@@ -133,15 +133,15 @@ const Signup = () => { */} - {t("auth.signup.title")} - Zuri Chat + {t("title")} - Zuri Chat
{ { { { // onFocus={displayImage} /> - {t("auth.signup.privacyAgreement")}{''} - {t("auth.signup.termsOfService")}{''} & - {''}{t("auth.signup.privacy")} + {t("privacyAgreement")} + {""} + + {t("termsOfService")} + {""}{" "} + + & + + {" "} + {""} + {t("privacy")} + diff --git a/packages/control/src/translations/pages/Signup.js b/packages/control/src/translations/pages/Signup.js new file mode 100644 index 0000000000..d5ff37bda7 --- /dev/null +++ b/packages/control/src/translations/pages/Signup.js @@ -0,0 +1,226 @@ +export const Signup = [ + { + key: "title", + en: "Sign Up", + de: "Anmeldung", + nl: "Inschrijven", + engb: "Sign Up", + fr: "S'inscrire", + zh: "报名", + ar: "اشتراك", + es: "Inscribirse", + it: "Iscriviti", + iw: "הירשם", + pt: "Inscrever-se" + }, + { + key: "header", + en: "Create Account", + de: "Benutzerkonto erstellen", + nl: "Maak een account aan", + engb: "Create Account", + fr: "Créer un compte", + zh: "创建账户", + ar: "إنشاء حساب", + es: "Crear una cuenta", + it: "Creare un profilo", + iw: "צור חשבון", + pt: "Criar Conta" + }, + { + key: "googleHeader", + en: "Sign up with Google", + de: "Melden Sie sich bei Google an", + nl: "Meld u aan bij Google", + engb: "Sign up with Google", + fr: "Inscrivez-vous avec Google", + zh: "注册Google", + ar: "الاشتراك مع جوجل", + es: "Regístrese con Google", + it: "Iscriviti con Google", + iw: "הירשם ל- Google", + pt: "Inscreva-se no Google" + }, + { + key: "topLineText", + en: "OR", + de: "ODER", + nl: "OF", + engb: "OR", + fr: "OU", + zh: "或者", + ar: "أو", + es: "O", + it: "O", + iw: "אוֹ", + pt: "OU" + }, + { + key: "submitButtonName", + en: "Sign up", + de: "Anmelden", + nl: "Inschrijven", + engb: "Sign up", + fr: "S'inscrire", + zh: "注册", + ar: "اشتراك", + es: "Inscribirse", + it: "Iscrizione", + iw: "הירשם", + pt: "Inscrever-se" + }, + { + key: "bottomLine", + en: "Already have an account?", + de: "Sie haben bereits ein Konto?", + nl: "Heb je al een account?", + engb: "Already have an account?", + fr: "Vous avez déjà un compte?", + zh: "已经有一个帐户？", + ar: "هل لديك حساب؟", + es: "¿Ya tienes una cuenta?", + it: "Hai già un account?", + iw: "כבר יש לך חשבון?", + pt: "já tem uma conta?" + }, + { + key: "bottomLink", + en: "Log in", + de: "Einloggen", + nl: "Log in", + engb: "Log in", + fr: "Connexion", + zh: "登录", + ar: "يسجل دخول", + es: "Iniciar sesión", + it: "Accesso", + iw: "התחברות", + pt: "Conecte-se" + }, + { + key: "fullName", + en: "Full Name", + de: "Vollständiger Name", + nl: "Voor-en achternaam", + engb: "Full Name", + fr: "Nom et prénom", + zh: "全名", + ar: "الاسم بالكامل", + es: "Nombre completo", + it: "Nome e cognome", + iw: "שם מלא", + pt: "Nome completo" + }, + { + key: "fullNamePlaceholder", + en: "Enter your Name", + de: "Gib deinen Namen ein", + nl: "Vul uw naam in", + engb: "Enter your Name", + fr: "Entrez votre nom", + zh: "输入你的名字", + ar: "أدخل أسمك", + es: "Introduzca su nombre", + it: "Inserisci il tuo nome", + iw: "הזן את שמך", + pt: "Digite seu nome" + }, + { + key: "emailAddress", + en: "Email Address", + de: "E-Mail-Addresse", + nl: "E-mailadres", + engb: "Email Address", + fr: "Adresse e-mail", + zh: "电子邮件地址", + ar: "عنوان البريد الإلكتروني", + es: "Dirección de correo electrónico", + it: "Indirizzo email", + iw: 'כתובת דוא"ל', + pt: "Endereço de e-mail" + }, + { + key: "emailAddressPlaceholder", + en: "Enter you email address", + de: "Geben Sie eine E-Mail-Adresse ein", + nl: "Voer je e-mailadres in", + engb: "Enter you email address", + fr: "Entrez votre adresse e-mail", + zh: "输入您的电子邮件地址", + ar: "أدخل عنوان البريد الإلكتروني", + es: "Ingrese su dirección de correo electrónico", + it: "Inserisci l'indirizzo email", + iw: 'הזן לך כתובת דוא"ל', + pt: "Digite seu endereço de e-mail" + }, + { + key: "password", + en: "Password", + de: "Passwort", + nl: "Wachtwoord", + engb: "Password", + fr: "Mot de passe", + zh: "密码", + ar: "كلمه السر", + es: "Contraseña", + it: "Parola d'ordine", + iw: "סיסמה", + pt: "Senha" + }, + { + key: "inputPassword", + en: "Enter a password", + de: "Geben Sie ein Passwort ein", + nl: "Vul een wachtwoord in", + engb: "Enter a password", + fr: "Entrer un mot de passe", + zh: "输入密码", + ar: "أدخل كلمة مرور", + es: "Ingrese una contraseña", + it: "Inserisci una password", + iw: "הכנס סיסמא", + pt: "insira uma senha" + }, + { + key: "privacyAgreement", + en: "I agree to Zuri Chat's", + de: "Ich stimme dem ZURI-Chat zu", + nl: "Ik ga akkoord met Zuri Chat's", + engb: "I agree to Zuri Chat's", + fr: "J'accepte que Zuri Chat", + zh: "我同意zuri聊天", + ar: "أوافق على zuri الدردشة", + es: "Estoy de acuerdo con Zuri Chat's", + it: "Accetto a Zuri Chat", + iw: "אני מסכים לזורי צ'אט", + pt: "Eu concordo com o chat de Zuri" + }, + { + key: "termsOfService", + en: "Terms of services", + de: "Nutzungsbedingungen.", + nl: "Servicevoorwaarden", + engb: "Terms of services", + fr: "Conditions de services", + zh: "服务条款", + ar: "شروط الخدمة", + es: "Términos de servicios", + it: "Termini di servizi", + iw: "תנאי שירותים", + pt: "Termos de serviços" + }, + { + key: "privacy", + en: "Privacy", + de: "Privatsphäre", + nl: "Privacy", + engb: "Privacy", + fr: "Intimité", + zh: "隐私", + ar: "خصوصية", + es: "Intimidad", + it: "Privacy", + iw: "פְּרָטִיוּת", + pt: "Privacidade" + } +] diff --git a/packages/control/src/translator.js b/packages/control/src/translator.js index f112964e21..7ae63cc725 100644 --- a/packages/control/src/translator.js +++ b/packages/control/src/translator.js @@ -3,6 +3,7 @@ import { NavBar } from "./translations/nav" import { Footer } from "./translations/footer" import { whyzurichat } from "./translations/pages/whyzurichat" import { Login } from "./translations/pages/login" +import { Signup } from "./translations/pages/Signup" export const googleTranslateElementInit = async () => { const lang = localStorage.getItem("myLanguage") @@ -26,7 +27,8 @@ export const getTranslations = () => { ...NavBar, ...Footer, ...whyzurichat, - ...Login + ...Login, + ...Signup ] langData.forEach(o => { Object.keys(o).forEach(key => { From daada41f4eaffc095773ffebd9b86e6c528bb121 Mon Sep 17 00:00:00 2001 From: Ufia Irene <89124723+UfiairENE@users.noreply.github.com> Date: Mon, 1 Nov 2021 13:53:23 +0100 Subject: [PATCH 2/2] fixed: codebase translation for signup page --- packages/control/src/pages/signup/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/control/src/pages/signup/index.js b/packages/control/src/pages/signup/index.js index 2f56b19104..103cafc5a5 100644 --- a/packages/control/src/pages/signup/index.js +++ b/packages/control/src/pages/signup/index.js @@ -145,8 +145,8 @@ const Signup = () => { disabled={name && email && password && tos} error={error} handleSubmit={handleSubmit} - bottomLine={t("auth.signup.form.bottomLine")} - bottomLink={t("auth.signup.form.bottomLink")} + bottomLine={t("bottomLine")} + bottomLink={t("bottomLink")} bottomLinkHref="login" >