translations: Fixed Settings translations

Author: okbrandon

frontend/public/locales/EN/translation.json

@@ -49,14 +49,16 @@
 			"successMessage": "OTP has been set to your chosen platform.",
 			"disableButton": "Disable 2FA",
 			"enableButton": "Enable 2FA",
-			"scanMessage": "Scan this QR code with your authenticator app to set up OTP."
+			"scanMessage": "Scan this QR code with your authenticator app to set up OTP.",
+			"requestSent": "A request has been sent."
 		}
 	},
 	"restrictions": {
 		"username": {
 			"required": "Username is required.",
 			"invalidLength": "Username must be 4-16 characters long.",
 			"invalidCharacters": "Username must contain only alphanumeric characters.",
+			"invalidFormat": "Username cannot end with '42'.",
 			"errorKeyword": "Username"
 		},
 		"displayName": {
@@ -310,6 +312,7 @@
 		"privacy": {
 			"title": "Data Privacy",
 			"subTitle": "Come back in a few minutes while we prepare your data...",
+			"downloadingMessage": "Your data is being downloaded...",
 			"subSections": {
 				"downloadData": {
 					"title": "Download Data",
@@ -325,6 +328,7 @@
 		},
 		"visibility": {
 			"title": "Visibility",
+			"successMessage": "User has been unblocked.",
 			"subSections": {
 				"blockedUsers": {
 					"title": "Blocked Users",

frontend/public/locales/ES/translation.json

@@ -49,14 +49,16 @@
 			"successMessage": "OTP se ha configurado en la plataforma elegida.",
 			"disableButton": "Desactivar 2FA",
 			"enableButton": "Activar 2FA",
-			"scanMessage": "Escanea este código QR con tu aplicación de autenticación para configurar OTP."
+			"scanMessage": "Escanea este código QR con tu aplicación de autenticación para configurar OTP.",
+			"requestSent": "Se ha enviado una solicitud."
 		}
 	},
 	"restrictions": {
 		"username": {
 			"required": "Se requiere un nombre de usuario.",
 			"invalidLength": "El nombre de usuario debe tener entre 4 y 16 caracteres.",
 			"invalidCharacters": "El nombre de usuario solo puede contener caracteres alfanuméricos.",
+			"invalidFormat": "El nombre de usuario no puede terminar con '42'.",
 			"errorKeyword": "Nombre de usuario"
 		},
 		"displayName": {
@@ -310,6 +312,7 @@
 		"privacy": {
 			"title": "Privacidad de datos",
 			"subTitle": "Vuelve en unos minutos mientras preparamos tus datos...",
+			"downloadingMessage": "Tus datos se están descargando...",
 			"subSections": {
 				"downloadData": {
 					"title": "Descargar datos",
@@ -325,6 +328,7 @@
 		},
 		"visibility": {
 			"title": "Visibilidad",
+			"successMessage": "El usuario ha sido desbloqueado.",
 			"subSections": {
 				"blockedUsers": {
 					"title": "Usuarios bloqueados",

frontend/public/locales/FR/translation.json

@@ -49,14 +49,16 @@
 			"successMessage": "L'OTP a été configuré sur votre plateforme choisie.",
 			"disableButton": "Désactiver l'authentification à deux facteurs",
 			"enableButton": "Activer l'authentification à deux facteurs",
-			"scanMessage": "Scannez ce code QR avec votre application d'authentification pour configurer l'OTP."
+			"scanMessage": "Scannez ce code QR avec votre application d'authentification pour configurer l'OTP.",
+			"requestSent": "Une demande a été envoyée."
 		}
 	},
 	"restrictions": {
 		"username": {
 			"required": "Le nom d'utilisateur est requis.",
 			"invalidLength": "Le nom d'utilisateur doit comporter entre 4 et 16 caractères.",
 			"invalidCharacters": "Le nom d'utilisateur ne doit contenir que des caractères alphanumériques.",
+			"invalidFormat": "Le nom d'utilisateur ne peut pas se terminer par '42'.",
 			"errorKeyword": "Nom d'utilisateur"
 		},
 		"displayName": {
@@ -310,6 +312,7 @@
 		"privacy": {
 			"title": "Confidentialité des données",
 			"subTitle": "Revenez dans quelques minutes pendant que nous préparons vos données...",
+			"downloadingMessage": "Vos données sont en cours de téléchargement...",
 			"subSections": {
 				"downloadData": {
 					"title": "Télécharger les données",
@@ -325,6 +328,7 @@
 		},
 		"visibility": {
 			"title": "Visibilité",
+			"successMessage": "L'utilisateur a été débloqué.",
 			"subSections": {
 				"blockedUsers": {
 					"title": "Utilisateurs bloqués",

frontend/src/components/Settings/AccountPreferences/AccountPreferences.js

@@ -61,7 +61,7 @@ const AccountPreferences = ({ user, setUser }) => {
 		} else if (data.username.length < 4 || data.username.length > 16) {
 			return t('restrictions.username.invalidLength');
 		} else if (/42$/.test(data.username)) {
-			return ('Username cannot end with 42'); // Brandon this needs translation
+			return t('restrictions.username.invalidFormat');
 		} else if (/[^a-zA-Z0-9]/.test(data.username)) {
 			return t('restrictions.username.invalidCharacters');
 		} else if (data.displayName && (data.displayName.length < 4 || data.displayName.length > 16)) {

frontend/src/components/Settings/Privacy.js

@@ -55,7 +55,7 @@ const Privacy = () => {
 				window.URL.revokeObjectURL(blobUrl);
 				console.log('Data harvested');
 				setIsHarvesting(true);
-				addNotification('success', 'Download started');
+				addNotification('success', t('settings.privacy.downloadingMessage'));
 			})
 			.catch(err => {
 				addNotification('error', `${err?.response?.data?.error || 'An error occurred'}`);
@@ -68,7 +68,7 @@ const Privacy = () => {
 		setLoading(true);
 		API.post('users/@me/harvest')
 			.then(() => {
-				addNotification('success', 'Data harvesting scheduled');
+				addNotification('success', t('settings.privacy.subTitle'));
 				setIsHarvesting(true);
 			})
 			.catch(err => {

frontend/src/components/Settings/Security/2FA/TwoFactorAuthDeactivate.js

@@ -29,7 +29,7 @@ const TwoFactorAuthDeactivate = ({ setShow2FA, setShowQRCode, setIs2FAEnabled })
 	const handlePlatform = platform => {
 		API.post('auth/totp/request', { platform })
 			.then(() => {
-				addNotification('success', 'Request sent');
+				addNotification('success', t('auth.twoFactor.requestSent'));
 			})
 			.catch(err => {
 				addNotification('error', `${err?.response?.data?.error || 'An error occurred'}`);

frontend/src/components/Settings/Security/2FA/TwoFactorAuthSecurity.js

@@ -30,12 +30,12 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setShowTwoFactorAuth }) => {
 	const handlePlatform = useCallback(platform => {
 		API.post('auth/totp/request', { platform })
 			.then(() => {
-				addNotification('success', 'Request sent');
+				addNotification('success', t('auth.twoFactor.requestSent'));
 			})
 			.catch(err => {
 				addNotification('error', `${err?.response?.data?.error || 'An error occurred'}`);
 			});
-	}, [addNotification]);
+	}, [addNotification, t]);
 
 	const handleSubmit = e => {
 		e.preventDefault();
@@ -46,7 +46,7 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setShowTwoFactorAuth }) => {
 
 		API.patch('users/@me/profile', { ...submissionData, otp: authCode })
 			.then(() => {
-				addNotification('success', 'Security updated successfully');
+				addNotification('success', t('settings.security.successMessage'));
 				getUser()
 					.then(res => {
 						setUser(res.data);
@@ -69,7 +69,7 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setShowTwoFactorAuth }) => {
 			<Backdrop/>
 				<FormContainer onSubmit={handleSubmit}>
 					<h1>{t('auth.twoFactor.title')}</h1>
-					<p>{t('auth.twoFactor.subTitle')} caca</p>
+					<p>{t('auth.twoFactor.subTitle')}</p>
 
 					<OTPInputComponent setAuthCode={setAuthCode} setDisableVerify={setDisableVerify}/>
 

frontend/src/components/Settings/Security/TwoFactorAuthSecurity.js

@@ -6,12 +6,14 @@ import { AvailablePlatformsContainer, PlatformButton } from '../../Auth/styles/T
 import { getUser } from '../../../api/user';
 import { Backdrop, FormContainer } from '../styles/TwoFactorAuthSecurity.styled';
 import PongButton from '../../../styles/shared/PongButton.styled';
+import { useTranslation } from 'react-i18next';
 
 const TwoFactorAuthSecurity = ({ formData, setUser, setSuccess, setShowTwoFactorAuth }) => {
 	const [availablePlatforms, setAvailablePlatforms] = useState([]);
 	const [authCode, setAuthCode] = useState('');
 	const [disableVerify, setDisableVerify] = useState(true);
 	const [error, setError] = useState('');
+	const { t } = useTranslation();
 
 	useEffect(() => {
 		API.get('auth/totp/platform_availability')
@@ -49,7 +51,7 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setSuccess, setShowTwoFactor
 		API.patch('users/@me/profile', { ...submissionData, otp: authCode })
 			.then(res => {
 				console.log('2FA: Success');
-				setSuccess('Security updated successfully');
+				setSuccess(t('settings.security.successMessage'));
 				getUser()
 					.then(res => {
 						setUser(res.data);
@@ -74,8 +76,8 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setSuccess, setShowTwoFactor
 		<>
 			<Backdrop/>
 			<FormContainer onSubmit={handleSubmit}>
-				<h1>Two Factor Authentication</h1>
-				<p>Enter the 6-digit code generated by your chosen platform.</p>
+				<h1>{t('auth.twoFactor.title')}</h1>
+				<p>{t('auth.twoFactor.subTitle')}</p>
 
 				<OTPInputComponent setAuthCode={setAuthCode} setDisableVerify={setDisableVerify}/>
 
@@ -92,16 +94,16 @@ const TwoFactorAuthSecurity = ({ formData, setUser, setSuccess, setShowTwoFactor
 							{platform === "sms" && <i className="bi bi-chat-left-text-fill"/>}
 						</PlatformButton>
 					)) : (
-						<p>No Available Platforms...</p>
+						<p>{t('auth.twoFactor.noAvailablePlatform')}</p>
 					)}
 				</AvailablePlatformsContainer>
 
 				<PongButton type="submit" disabled={disableVerify}>
-					Verify
+					{t('auth.twoFactor.verifyButton')}
 				</PongButton>
 
 				<PongButton type="button" onClick={() => setShowTwoFactorAuth(false)}>
-					Back
+					{t('auth.twoFactor.backButton')}
 				</PongButton>
 			</FormContainer>
 		</>

frontend/src/components/Settings/Visibility.js

@@ -39,7 +39,7 @@ const Visibility = () => {
 		setLoading(true);
 		API.delete(`users/@me/relationships/${relationshipID}`)
 			.then(() => {
-				addNotification('success', 'User unblocked');
+				addNotification('success', t('settings.visibility.successMessage'));
 				setIsRefetch(true);
 			})
 			.catch(err => {