Merge pull request #2239 from sonvir249/bug/fix-form-errors

Issue-2238: Fixes the error messages on various forms.

client/src/Pages/Auth/ForgotPassword.jsx

@@ -185,7 +185,7 @@ const ForgotPassword = () => {
 							value={form.email}
 							onChange={handleChange}
 							error={errors.email ? true : false}
-							helperText={errors.email}
+							helperText={t(errors.email)}
 						/>
 						<Button
 							variant="contained"

client/src/Pages/Auth/Register/StepTwo/index.jsx

@@ -71,7 +71,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 						helperText={errors.email && (
 						errors.email.includes("required") ? t("authRegisterEmailRequired") :
 						errors.email.includes("valid email") ? t("authRegisterEmailInvalid") :
-						errors.email
+						t(errors.email)
 					)}
 						ref={inputRef}
 					/>

client/src/Validation/validation.js

@@ -15,6 +15,17 @@ const nameSchema = joi
 			"Name must contain only letters, spaces, apostrophes, or hyphens",
 	});
 
+const lastnameSchema = joi
+	.string()
+	.max(50)
+	.trim()
+	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
+	.messages({
+		"string.empty": "Surname is required",
+		"string.max": "Surname must be less than 50 characters",
+		"string.pattern.base": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+	});
+
 const passwordSchema = joi
 	.string()
 	.trim()
@@ -54,7 +65,7 @@ const passwordSchema = joi
 
 const credentials = joi.object({
 	firstName: nameSchema,
-	lastName: nameSchema,
+	lastName: lastnameSchema,
 	email: joi
 		.string()
 		.trim()