Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(auth-pages): allow translation for required input field messages #5868

Merged
merged 14 commits into from Apr 25, 2024
Merged

feat(auth-pages): allow translation for required input field messages #5868

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
96a06ab
docs: add new fields in translation files
Ac-Srikanth Apr 19, 2024
3ba206d
feat: add message with translate for required input fields in all aut…
Ac-Srikanth Apr 19, 2024
03b3078
Merge branch 'master' of https://github.com/Ac-Srikanth/refine into f…
Ac-Srikanth Apr 19, 2024
3a8eb74
feat(mui): add message with translate for required auth input fields…
Ac-Srikanth Apr 19, 2024
1f58929
chore: add Changeset
Ac-Srikanth Apr 23, 2024
51ee399
Merge branch 'master' of https://github.com/Ac-Srikanth/refine into f…
Ac-Srikanth Apr 23, 2024
6bf746a
Merge branch 'master' into feat/Allow-translation-for-required-field-…
Ac-Srikanth Apr 24, 2024
c64aee1
docs(blog): add uuid post (#5885)
necatiozmen Apr 25, 2024
8ddf9cf
feat(live-previews): add news keys in translation files
Ac-Srikanth Apr 25, 2024
70f2686
chore: update changeset
Ac-Srikanth Apr 25, 2024
f832ab3
Merge branch 'feat/Allow-translation-for-required-field-messages' of …
Ac-Srikanth Apr 25, 2024
7d27e8a
Merge branch 'master' into feat/Allow-translation-for-required-field-…
Ac-Srikanth Apr 25, 2024
cd4a5ae
chore: remove live preview from changeset
Ac-Srikanth Apr 25, 2024
e4d8ad5
Merge branch 'feat/Allow-translation-for-required-field-messages' of …
Ac-Srikanth Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions documentation/docs/partials/_partial-translation-file-de.md
View file
Open in desktop
Expand Up @@ -11,7 +11,9 @@
"password": "Passwort"
},
"errors": {
"validEmail": "Ungültige E-Mail-Adresse"
"validEmail": "Ungültige E-Mail-Adresse",
"requiredEmail": "E-Mail ist erforderlich",
"requiredPassword": "Passwort wird benötigt"
},
"buttons": {
"submit": "Anmeldung",
Expand All @@ -26,7 +28,8 @@
"email": "Email"
},
"errors": {
"validEmail": "Ungültige E-Mail-Adresse"
"validEmail": "Ungültige E-Mail-Adresse",
"requiredEmail": "E-Mail ist erforderlich"
},
"buttons": {
"submit": "Anweisungen zum Zurücksetzen senden"
Expand All @@ -39,7 +42,9 @@
"password": "Passwort"
},
"errors": {
"validEmail": "Ungültige E-Mail-Adresse"
"validEmail": "Ungültige E-Mail-Adresse",
"requiredEmail": "E-Mail ist erforderlich",
"requiredPassword": "Passwort wird benötigt"
},
"buttons": {
"submit": "Registrieren",
Expand All @@ -53,7 +58,9 @@
"confirmPassword": "Bestätige neues Passwort"
},
"errors": {
"confirmPasswordNotMatch": "Passwörter stimmen nicht überein"
"confirmPasswordNotMatch": "Passwörter stimmen nicht überein",
"requiredPassword": "Passwort wird benötigt",
"requiredConfirmPassword": "Das Feld „Passwort bestätigen“ ist erforderlich"
},
"buttons": {
"submit": "Aktualisieren"
Expand Down
15 changes: 11 additions & 4 deletions documentation/docs/partials/_partial-translation-file-en.md
View file
Open in desktop
Expand Up @@ -11,7 +11,9 @@
"password": "Password"
},
"errors": {
"validEmail": "Invalid email address"
"validEmail": "Invalid email address",
"requiredEmail": "Email is required",
"requiredPassword": "Password is required"
},
"buttons": {
"submit": "Login",
Expand All @@ -26,7 +28,8 @@
"email": "Email"
},
"errors": {
"validEmail": "Invalid email address"
"validEmail": "Invalid email address",
"requiredEmail": "Email is required"
},
"buttons": {
"submit": "Send reset instructions"
Expand All @@ -39,7 +42,9 @@
"password": "Password"
},
"errors": {
"validEmail": "Invalid email address"
"validEmail": "Invalid email address",
"requiredEmail": "Email is required",
"requiredPassword": "Password is required"
},
"buttons": {
"submit": "Register",
Expand All @@ -53,7 +58,9 @@
"confirmPassword": "Confirm new password"
},
"errors": {
"confirmPasswordNotMatch": "Passwords do not match"
"confirmPasswordNotMatch": "Passwords do not match",
"requiredPassword": "Password required",
"requiredConfirmPassword": "Confirm password is required"
},
"buttons": {
"submit": "Update"
Expand Down
8 changes: 7 additions & 1 deletion packages/antd/src/components/pages/auth/components/forgotPassword/index.tsx
View file
Open in desktop
Expand Up @@ -112,7 +112,13 @@ export const ForgotPasswordPage: React.FC<ResetPassworProps> = ({
name="email"
label={translate("pages.forgotPassword.fields.email", "Email")}
rules={[
{ required: true },
{
required: true,
message: translate(
"pages.forgotPassword.errors.requiredEmail",
"Email is required",
),
},
{
type: "email",
message: translate(
Expand Down
18 changes: 16 additions & 2 deletions packages/antd/src/components/pages/auth/components/login/index.tsx
View file
Open in desktop
Expand Up @@ -163,7 +163,13 @@ export const LoginPage: React.FC<LoginProps> = ({
name="email"
label={translate("pages.login.fields.email", "Email")}
rules={[
{ required: true },
{
required: true,
message: translate(
"pages.login.errors.requiredEmail",
"Email is required",
),
},
{
type: "email",
message: translate(
Expand All @@ -181,7 +187,15 @@ export const LoginPage: React.FC<LoginProps> = ({
<Form.Item
name="password"
label={translate("pages.login.fields.password", "Password")}
rules={[{ required: true }]}
rules={[
{
required: true,
message: translate(
"pages.login.errors.requiredPassword",
"Password is required",
),
},
]}
>
<Input
type="password"
Expand Down
18 changes: 16 additions & 2 deletions packages/antd/src/components/pages/auth/components/register/index.tsx
View file
Open in desktop
Expand Up @@ -157,7 +157,13 @@ export const RegisterPage: React.FC<RegisterProps> = ({
name="email"
label={translate("pages.register.email", "Email")}
rules={[
{ required: true },
{
required: true,
message: translate(
"pages.register.errors.requiredEmail",
"Email is required",
),
},
{
type: "email",
message: translate(
Expand All @@ -175,7 +181,15 @@ export const RegisterPage: React.FC<RegisterProps> = ({
<Form.Item
name="password"
label={translate("pages.register.fields.password", "Password")}
rules={[{ required: true }]}
rules={[
{
required: true,
message: translate(
"pages.register.errors.requiredPassword",
"Password is required",
),
},
]}
>
<Input type="password" placeholder="●●●●●●●●" size="large" />
</Form.Item>
Expand Down
14 changes: 13 additions & 1 deletion packages/antd/src/components/pages/auth/components/updatePassword/index.tsx
View file
Open in desktop
Expand Up @@ -106,7 +106,15 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({
"pages.updatePassword.fields.password",
"New Password",
)}
rules={[{ required: true }]}
rules={[
{
required: true,
message: translate(
"pages.updatePassword.errors.requiredPassword",
"Password is required",
),
},
]}
style={{ marginBottom: "12px" }}
>
<Input type="password" placeholder="●●●●●●●●" size="large" />
Expand All @@ -122,6 +130,10 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({
rules={[
{
required: true,
message: translate(
"pages.updatePassword.errors.requiredConfirmPassword",
"Confirm password is required",
),
},
({ getFieldValue }) => ({
validator(_, value) {
Expand Down
5 changes: 4 additions & 1 deletion packages/chakra-ui/src/components/pages/auth/components/forgotPassword/index.tsx
View file
Open in desktop
Expand Up @@ -110,7 +110,10 @@ export const ForgotPasswordPage: React.FC<ForgotPasswordProps> = ({
id="email"
type="text"
{...register("email", {
required: true,
required: translate(
"pages.forgotPassword.errors.requiredEmail",
"Email is required",
),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: translate(
Expand Down
10 changes: 8 additions & 2 deletions packages/chakra-ui/src/components/pages/auth/components/login/index.tsx
View file
Open in desktop
Expand Up @@ -155,7 +155,10 @@ export const LoginPage: React.FC<LoginProps> = ({
placeholder="Email"
type="text"
{...register("email", {
required: true,
required: translate(
"pages.login.errors.requiredEmail",
"Email is required",
),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: translate(
Expand All @@ -177,7 +180,10 @@ export const LoginPage: React.FC<LoginProps> = ({
type="password"
placeholder="Password"
{...register("password", {
required: true,
required: translate(
"pages.login.errors.requiredPassword",
"Password is required",
),
})}
/>
<FormErrorMessage>{`${errors.password?.message}`}</FormErrorMessage>
Expand Down
10 changes: 8 additions & 2 deletions packages/chakra-ui/src/components/pages/auth/components/register/index.tsx
View file
Open in desktop
Expand Up @@ -148,7 +148,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
type="text"
placeholder="Email"
{...register("email", {
required: true,
required: translate(
"pages.register.errors.requiredEmail",
"Email is required",
),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: translate(
Expand All @@ -170,7 +173,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
type="password"
placeholder="Password"
{...register("password", {
required: true,
required: translate(
"pages.register.errors.requiredPassword",
"Password is required",
),
})}
/>
<FormErrorMessage>{`${errors.password?.message}`}</FormErrorMessage>
Expand Down
10 changes: 8 additions & 2 deletions packages/chakra-ui/src/components/pages/auth/components/updatePassword/index.tsx
View file
Open in desktop
Expand Up @@ -104,7 +104,10 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({
type="password"
placeholder="Password"
{...register("password", {
required: true,
required: translate(
"pages.updatePassword.errors.requiredPassword",
"Password required",
),
})}
/>
<FormErrorMessage>{`${errors.password?.message}`}</FormErrorMessage>
Expand All @@ -122,7 +125,10 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({
type="password"
placeholder="Confirm Password"
{...register("confirmPassword", {
required: true,
required: translate(
"pages.updatePassword.errors.requiredConfirmPassword",
"Confirm password is required",
),
validate: (val: any) => {
if (watch("password") !== val) {
return translate(
Expand Down
5 changes: 4 additions & 1 deletion packages/mui/src/components/pages/auth/components/forgotPassword/index.tsx
View file
Open in desktop
Expand Up @@ -112,7 +112,10 @@ export const ForgotPasswordPage: React.FC<ForgotPasswordProps> = ({
>
<TextField
{...register("email", {
required: true,
required: translate(
"pages.forgotPassword.errors.requiredEmail",
"Email is required",
),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: translate(
Expand Down
10 changes: 8 additions & 2 deletions packages/mui/src/components/pages/auth/components/login/index.tsx
View file
Open in desktop
Expand Up @@ -164,7 +164,10 @@ export const LoginPage: React.FC<LoginProps> = ({
>
<TextField
{...register("email", {
required: true,
required: translate(
"pages.login.errors.requiredEmail",
"Email is required",
),
})}
id="email"
margin="normal"
Expand All @@ -180,7 +183,10 @@ export const LoginPage: React.FC<LoginProps> = ({
/>
<TextField
{...register("password", {
required: true,
required: translate(
"pages.login.errors.requiredPassword",
"Password is required",
),
})}
id="password"
margin="normal"
Expand Down
10 changes: 8 additions & 2 deletions packages/mui/src/components/pages/auth/components/register/index.tsx
View file
Open in desktop
Expand Up @@ -167,7 +167,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
>
<TextField
{...register("email", {
required: true,
required: translate(
"pages.register.errors.requiredEmail",
"Email is required",
),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: translate(
Expand All @@ -190,7 +193,10 @@ export const RegisterPage: React.FC<RegisterProps> = ({
/>
<TextField
{...register("password", {
required: true,
required: translate(
"pages.register.errors.requiredPassword",
"Password is required",
),
})}
id="password"
margin="normal"
Expand Down
10 changes: 8 additions & 2 deletions packages/mui/src/components/pages/auth/components/updatePassword/index.tsx
View file
Open in desktop
Expand Up @@ -110,7 +110,10 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({
>
<TextField
{...register("password", {
required: true,
required: translate(
"pages.updatePassword.errors.requiredPassword",
"Password required",
),
})}
id="password"
margin="normal"
Expand All @@ -132,7 +135,10 @@ export const UpdatePasswordPage: React.FC<UpdatePasswordProps> = ({

<TextField
{...register("confirmPassword", {
required: true,
required: translate(
"pages.updatePassword.errors.requiredConfirmPassword",
"Confirm Password is required",
),
validate: (value?: string) => {
if (watch("password") !== value) {
return translate(
Expand Down