diff --git a/ui/src/views/auth/Register.tsx b/ui/src/views/auth/Register.tsx
index 9e5a5db4..ca791967 100644
--- a/ui/src/views/auth/Register.tsx
+++ b/ui/src/views/auth/Register.tsx
@@ -11,6 +11,7 @@ import Captcha from '@/components/shared/Captcha'
import { Field, Form, Formik } from 'formik'
import { useState } from 'react'
import * as Yup from 'yup'
+import { useLocalization } from '@/utils/hooks/useLocalization'
type SignUpFormSchema = {
password: string
@@ -21,11 +22,11 @@ type SignUpFormSchema = {
}
const validationSchema = Yup.object().shape({
- email: Yup.string().email('Invalid email').required('Please enter your email'),
- password: Yup.string().required('Please enter your password'),
+ email: Yup.string().email().required(),
+ password: Yup.string().required(),
confirmPassword: Yup.string().oneOf([Yup.ref('password')], 'Your passwords do not match'),
- name: Yup.string().required('Name is required'),
- surname: Yup.string().required('Surname is required'),
+ name: Yup.string().required(),
+ surname: Yup.string().required(),
})
const Register = () => {
@@ -33,6 +34,7 @@ const Register = () => {
const signInUrl = ROUTES_ENUM.account.login
const { signUp } = useAuth()
+ const { translate } = useLocalization()
const [message, setMessage] = useState('')
const [error, setError] = useTimeOutMessage(10000)
@@ -48,7 +50,7 @@ const Register = () => {
setError(result.message)
setMessage('')
} else {
- setMessage('Success. Please confirm your account by clicking the link.')
+ setMessage(translate('::Abp.Account.Register.ResultMessage'))
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
setError('')
}
@@ -59,8 +61,8 @@ const Register = () => {
return (
<>
{message && (
@@ -95,7 +97,7 @@ const Register = () => {
diff --git a/ui/src/views/auth/ResetPassword.tsx b/ui/src/views/auth/ResetPassword.tsx
index 9bd3f8eb..08d723e4 100644
--- a/ui/src/views/auth/ResetPassword.tsx
+++ b/ui/src/views/auth/ResetPassword.tsx
@@ -5,6 +5,7 @@ import Button from '@/components/ui/Button'
import { FormContainer, FormItem } from '@/components/ui/Form'
import { ROUTES_ENUM } from '@/constants/route.constant'
import { resetPassword } from '@/proxy/account/account.service'
+import { useLocalization } from '@/utils/hooks/useLocalization'
import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
import type { AxiosError } from 'axios'
import { Field, Form, Formik } from 'formik'
@@ -29,6 +30,7 @@ const ResetPassword = () => {
const [searchParams] = useSearchParams()
const userId = searchParams.get('userId')
const resetToken = searchParams.get('resetToken')
+ const { translate } = useLocalization()
// bu olmadan da oluyor sanırım
// const result = useQuery({
@@ -78,13 +80,13 @@ const ResetPassword = () => {
{resetComplete ? (
<>
-
Reset done
-
Your password has been successfully reset
+
{translate('::Abp.Account.ResetPassword.ResetDone')}
+
{translate('::Abp.Account.ResetPassword.ResetDone.Message')}
) : (
<>
-
Set new password
-
Your new password must different to previos password
+
{translate('::Abp.Account.ResetPassword.SetNewPassword')}
+
{translate('::Abp.Account.ResetPassword.SetNewPassword.Message')}
)}
@@ -113,26 +115,26 @@ const ResetPassword = () => {
{!resetComplete ? (
<>
@@ -142,13 +144,13 @@ const ResetPassword = () => {
) : (
)}
-
Back to
-
Sign in
+
{translate('::Abp.Account.Backto')}
+
{translate('::Abp.Account.SignIn')}
diff --git a/ui/src/views/auth/SendConfirmationCode.tsx b/ui/src/views/auth/SendConfirmationCode.tsx
index eb39d0e1..3b3b5353 100644
--- a/ui/src/views/auth/SendConfirmationCode.tsx
+++ b/ui/src/views/auth/SendConfirmationCode.tsx
@@ -6,6 +6,7 @@ import { ActionLink } from '@/components/shared'
import { ROUTES_ENUM } from '@/constants/route.constant'
import { store } from '@/store'
import Captcha from '@/components/shared/Captcha'
+import { useLocalization } from '@/utils/hooks/useLocalization'
type FormSchema = {
email: string
@@ -13,12 +14,13 @@ type FormSchema = {
}
const validationSchema = Yup.object().shape({
- email: Yup.string().required('Please enter your user email'),
+ email: Yup.string().required(),
captchaResponse: Yup.string().required(),
})
const SendConfirmationCode = () => {
const { userName } = store.getState().auth.user
+ const { translate } = useLocalization()
const { message, error, sendConfirmationCode } = useAccount()
@@ -33,8 +35,8 @@ const SendConfirmationCode = () => {
return (
<>
-
Confirm Email
-
Please enter your email to receive new confirmation code
+
{translate('::Abp.Account.SendConfirmationCode')}
+
{translate('::Abp.Account.SendConfirmationCode.Message')}
{message && (
@@ -61,7 +63,7 @@ const SendConfirmationCode = () => {
diff --git a/ui/src/views/auth/VerifyConfirmationCode.tsx b/ui/src/views/auth/VerifyConfirmationCode.tsx
index 7f4ba6b2..319b5f3b 100644
--- a/ui/src/views/auth/VerifyConfirmationCode.tsx
+++ b/ui/src/views/auth/VerifyConfirmationCode.tsx
@@ -2,11 +2,13 @@ import { useQuery } from '@tanstack/react-query'
import { Alert, Button } from '@/components/ui'
import { useNavigate, useParams } from 'react-router-dom'
import useAccount from '@/utils/hooks/useAccount'
+import { useLocalization } from '@/utils/hooks/useLocalization'
const VerifyConfirmationCode = () => {
const { userId, token } = useParams()
const { message, error, verifyConfirmationCode } = useAccount()
const navigate = useNavigate()
+ const { translate } = useLocalization()
useQuery({
queryKey: ['verifyConfirmationCode', userId, token],
@@ -29,7 +31,7 @@ const VerifyConfirmationCode = () => {
{error}
)}