From fa0f4dd6ecf632c4013663867ebda4d220ec7cd0 Mon Sep 17 00:00:00 2001
From: mohadeseh safari <mohadeseh.safari1992@gmail.com>
Date: Sun, 27 Apr 2025 13:50:40 -0400
Subject: [PATCH] - Change "Sign up via email" to "Create super admin account"
 - Make Terms of Service and Privacy Policy text a single translatable
 sentence - Add translation keys for Name and Surname fields

---
 client/src/Pages/Auth/Register/Register.jsx   | 72 ++++++++++---------
 .../src/Pages/Auth/Register/StepOne/index.jsx |  4 +-
 client/src/locales/gb.json                    |  6 +-
 client/src/locales/ru.json                    |  6 +-
 client/src/locales/tr.json                    |  6 +-
 5 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
index 118357432..2415362ea 100644
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ b/client/src/Pages/Auth/Register/Register.jsx
@@ -15,7 +15,7 @@ import Background from "../../../assets/Images/background-grid.svg?react";
 import Logo from "../../../assets/icons/checkmate-icon.svg?react";
 import Mail from "../../../assets/icons/mail.svg?react";
 import "../index.css";
-import { useTranslation } from "react-i18next";
+import { useTranslation, Trans } from "react-i18next";
 /**
  * Displays the initial landing page.
  *
@@ -67,42 +67,44 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => {
 				</Box>
 				<Box maxWidth={400}>
 					<Typography className="tos-p">
-						{t("authRegisterBySigningUp")}{" "}
-						<Typography
-							component="span"
-							onClick={() => {
-								window.open(
-									"https://bluewavelabs.ca/terms-of-service-open-source",
-									"_blank",
-									"noreferrer"
-								);
-							}}
-							sx={{
-								"&:hover": {
+						<Trans i18nKey="authRegisterBySigningUp">
+							By creating an account, you agree to our
+							<Typography
+								component="span"
+								onClick={() => {
+									window.open(
+										"https://bluewavelabs.ca/terms-of-service-open-source",
+										"_blank",
+										"noreferrer"
+									);
+								}}
+								sx={{
+									"&:hover": {
 									color: theme.palette.primary.contrastTextTertiary,
-								},
-							}}
-						>
-							{t("authRegisterTerms")}
-						</Typography>{" "}
-						{t("and")}{" "}
-						<Typography
-							component="span"
-							onClick={() => {
-								window.open(
-									"https://bluewavelabs.ca/privacy-policy-open-source",
-									"_blank",
-									"noreferrer"
-								);
-							}}
-							sx={{
-								"&:hover": {
+									},
+								}}
+							>
+								Terms of Service
+							</Typography>
+							and
+							<Typography
+								component="span"
+								onClick={() => {
+									window.open(
+										"https://bluewavelabs.ca/privacy-policy-open-source",
+										"_blank",
+										"noreferrer"
+									);
+								}}
+								sx={{
+									"&:hover": {
 									color: theme.palette.primary.contrastTextTertiary,
-								},
-							}}
-						>
-							{t("authRegisterPrivacy")}
-						</Typography>
+									},
+								}}
+							>
+								Privacy Policy
+							</Typography>
+						</Trans>
 					</Typography>
 				</Box>
 			</Stack>
diff --git a/client/src/Pages/Auth/Register/StepOne/index.jsx b/client/src/Pages/Auth/Register/StepOne/index.jsx
index 4bb357e26..cb66f6704 100644
--- a/client/src/Pages/Auth/Register/StepOne/index.jsx
+++ b/client/src/Pages/Auth/Register/StepOne/index.jsx
@@ -64,7 +64,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 					>
 						<TextInput
 							id="register-firstname-input"
-							label="Name"
+							label={t("authRegisterFirstName")}
 							isRequired={true}
 							placeholder="Jordan"
 							autoComplete="given-name"
@@ -76,7 +76,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 						/>
 						<TextInput
 							id="register-lastname-input"
-							label="Surname"
+							label={t("authRegisterLastName")}
 							isRequired={true}
 							placeholder="Ellis"
 							autoComplete="family-name"
diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json
index 343386bec..6797e88fe 100644
--- a/client/src/locales/gb.json
+++ b/client/src/locales/gb.json
@@ -54,8 +54,10 @@
   "authPasswordMustMatch": "must match",
   "authRegisterCreateAccount": "Create your account to get started",
   "authRegisterCreateSuperAdminAccount": "Create your Super admin account to get started",
-  "authRegisterSignUpWithEmail": "Sign up with Email",
-  "authRegisterBySigningUp": "By signing up, you agree to our",
+  "authRegisterSignUpWithEmail": "Create super admin account",
+  "authRegisterBySigningUp": "By creating an account, you agree to our <1>Terms of Service</1> and <3>Privacy Policy</3>",
+  "authRegisterFirstName": "Name",
+  "authRegisterLastName": "Surname",
   "distributedStatusHeaderText": "Real-time, real-device coverage",
   "distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
   "settingsGeneralSettings": "General settings",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 5d0f649de..10ee15290 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -54,8 +54,10 @@
   "authPasswordMustMatch": "должен совпадать",
   "authRegisterCreateAccount": "Создайте свою учетную запись, чтобы начать",
   "authRegisterCreateSuperAdminAccount": "Создайте учетную запись суперадминистратора, чтобы начать работу",
-  "authRegisterSignUpWithEmail": "Зарегистрироваться по электронной почте",
-  "authRegisterBySigningUp": "Регистрируясь, вы соглашаетесь с нашими",
+  "authRegisterSignUpWithEmail": "Создать учетную запись суперадминистратора",
+  "authRegisterBySigningUp": "Создавая учетную запись, вы соглашаетесь с нашими <1>Условиями использования</1> и <3>Политикой конфиденциальности</3>",
+  "authRegisterFirstName": "Имя",
+  "authRegisterLastName": "Фамилия",
   "distributedStatusHeaderText": "Охват реального времени и реального устройства",
   "distributedStatusSubHeaderText": "Работает на миллионах устройств по всему миру, просматривайте производительность системы по глобальному региону, стране или городу",
   "settingsGeneralSettings": "Общие настройки",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 1b759a29d..02107630e 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -54,8 +54,10 @@
   "authPasswordMustMatch": "eşleşmelidir",
   "authRegisterCreateAccount": "Hesap oluşturmak için devam et",
   "authRegisterCreateSuperAdminAccount": "Super admin hesabınızı oluşturmak için devam edin",
-  "authRegisterSignUpWithEmail": "E-posta ile kayıt ol",
-  "authRegisterBySigningUp": "Kayıt olarak, aşağıdaki şartları kabul ediyorsunuz:",
+  "authRegisterSignUpWithEmail": "Süper yönetici hesabı oluştur",
+  "authRegisterBySigningUp": "Bir hesap oluşturarak, <1>Hizmet Şartlarımızı</1> ve <3>Gizlilik Politikamızı</3> kabul etmiş olursunuz",
+  "authRegisterFirstName": "Ad",
+  "authRegisterLastName": "Soyad",
   "distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
   "distributedStatusSubHeaderText": "Dünya çapında milyonlarca cihaz tarafından desteklenen sistem performansını küresel bölgeye, ülkeye veya şehre göre görüntüleyin",
   "settingsGeneralSettings": "Genel ayarlar",