diff --git a/client/src/containers/Authentication/AuthCopyright.js b/client/src/containers/Authentication/AuthCopyright.js index 104ec0489..084990fe1 100644 --- a/client/src/containers/Authentication/AuthCopyright.js +++ b/client/src/containers/Authentication/AuthCopyright.js @@ -1,14 +1,19 @@ import React from 'react'; import Icon from 'components/Icon'; +import moment from 'moment'; +import intl from 'react-intl-universal'; export default function AuthCopyright() { return ( + ); -} \ No newline at end of file +} diff --git a/client/src/containers/Authentication/InviteAcceptForm.js b/client/src/containers/Authentication/InviteAcceptForm.js index cc7d1164c..b3cf19c4b 100644 --- a/client/src/containers/Authentication/InviteAcceptForm.js +++ b/client/src/containers/Authentication/InviteAcceptForm.js @@ -13,15 +13,10 @@ import InviteAcceptFormContent from './InviteAcceptFormContent'; export default function InviteAcceptForm() { const history = useHistory(); - // Invite accept context. - const { - inviteAcceptMutate, - inviteMeta, - token, - } = useInviteAcceptContext(); - + const { inviteAcceptMutate, inviteMeta, token } = useInviteAcceptContext(); + // Invite value. const inviteValue = { organization_name: '', @@ -39,8 +34,13 @@ export default function InviteAcceptForm() { inviteAcceptMutate([values, token]) .then((response) => { AppToaster.show({ - message: `Congrats! Your account has been created and invited to - ${inviteValue.organization_name} organization successfully.`, + message: intl.getHTML( + 'congrats_your_account_has_been_created_and_invited', + { + organization_name: inviteValue.organization_name, + }, + ), + intent: Intent.SUCCESS, }); history.push('/auth/login'); @@ -67,7 +67,7 @@ export default function InviteAcceptForm() { } if (errors.find((e) => e.type === 'INVITE.TOKEN.NOT.FOUND')) { AppToaster.show({ - message: 'An unexpected error occurred', + message: intl.get('an_unexpected_error_occurred'), intent: Intent.DANGER, position: Position.BOTTOM, }); diff --git a/client/src/containers/Authentication/InviteAcceptFormContent.js b/client/src/containers/Authentication/InviteAcceptFormContent.js index a5d063446..a1ab053c7 100644 --- a/client/src/containers/Authentication/InviteAcceptFormContent.js +++ b/client/src/containers/Authentication/InviteAcceptFormContent.js @@ -36,7 +36,7 @@ export default function InviteUserFormContent() { {({ form, field, meta: { error, touched } }) => ( } + label={} className={'form-group--first_name'} intent={inputIntent({ error, touched })} helperText={} @@ -54,7 +54,7 @@ export default function InviteUserFormContent() { {({ form, field, meta: { error, touched } }) => ( } + label={} className={'form-group--last_name'} intent={inputIntent({ error, touched })} helperText={} @@ -72,7 +72,7 @@ export default function InviteUserFormContent() { {({ form, field, meta: { error, touched } }) => ( } + label={} className={'form-group--phone_number'} intent={inputIntent({ error, touched })} helperText={} @@ -105,7 +105,7 @@ export default function InviteUserFormContent() {

- {inviteMeta.email},
+ {inviteMeta.email},

diff --git a/client/src/containers/Authentication/SendResetPasswordForm.js b/client/src/containers/Authentication/SendResetPasswordForm.js index c84030db4..05ba7032a 100644 --- a/client/src/containers/Authentication/SendResetPasswordForm.js +++ b/client/src/containers/Authentication/SendResetPasswordForm.js @@ -1,10 +1,5 @@ import React from 'react'; -import { - Button, - InputGroup, - Intent, - FormGroup, -} from '@blueprintjs/core'; +import { Button, InputGroup, Intent, FormGroup } from '@blueprintjs/core'; import { Form, ErrorMessage, FastField } from 'formik'; import { FormattedMessage as T } from 'components'; import { inputIntent } from 'utils'; @@ -12,15 +7,13 @@ import { inputIntent } from 'utils'; /** * Send reset password form. */ -export default function SendResetPasswordForm({ - isSubmitting -}) { +export default function SendResetPasswordForm({ isSubmitting }) { return (

{({ form, field, meta: { error, touched } }) => ( } intent={inputIntent({ error, touched })} helperText={} className={'form-group--crediential'} diff --git a/client/src/containers/Setup/SetupInitializingForm.js b/client/src/containers/Setup/SetupInitializingForm.js index 09fbe601b..9b926bee7 100644 --- a/client/src/containers/Setup/SetupInitializingForm.js +++ b/client/src/containers/Setup/SetupInitializingForm.js @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; import { ProgressBar, Intent } from '@blueprintjs/core'; import { useBuildTenant } from 'hooks/query'; +import { FormattedMessage as T } from 'components'; import 'style/pages/Setup/Initializing.scss'; @@ -25,22 +26,34 @@ export default function SetupInitializingForm() {
{isLoading ? ( <> -

It's time to make your accounting really simple!

+

+ +

- while we set up your account, please remember to verify your - account by clicking on the link we sent to yout registered email - address +

) : isError ? ( <> -

Something went wrong!

-

Please refresh the page

+

+ +

+

+ +

) : ( <> -

Waiting to redirect

-

Refresh the page if redirect not worked.

+

+ +

+

+ +

)}
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json index 7e3802b38..bf88e0f1c 100644 --- a/client/src/lang/en/index.json +++ b/client/src/lang/en/index.json @@ -348,7 +348,7 @@ "session_expired": "Session Expired!", "this_report_does_not_contain_any_data_between_date_period": "This report does not contain any data between date period.", "welcome_organization_account_has_been_created": "👋 Welcome, You organization account has been created, Sign in now!", - "the_phone_number_already_used_in_another_account": "he phone number is already used in another account", + "the_phone_number_already_used_in_another_account": "the phone number is already used in another account", "the_email_already_used_in_another_account": "The email is already used in another account", "hide_filter": "Hide filter", "show_filter": "Show filter", @@ -1102,9 +1102,17 @@ "mm_dd_yy_": "MM-DD-YY", "dd_mm_yy_": "DD-MM-YY", "yy_mm_dd_": "YY-MM-DD", - "plan_radio_name":"{name}", - "there_were_no_purchases_during_the_selected_date_range":"There were no purchases during the selected date range.", - "there_were_no_sales_during_the_selected_date_range":"There were no sales during the selected date range.", - "there_were_no_inventory_transactions_during_the_selected_date_range":"There were no inventory transactions during the selected date range.", - "filter_":"Filter..." + "plan_radio_name": "{name}", + "there_were_no_purchases_during_the_selected_date_range": "There were no purchases during the selected date range.", + "there_were_no_sales_during_the_selected_date_range": "There were no sales during the selected date range.", + "there_were_no_inventory_transactions_during_the_selected_date_range": "There were no inventory transactions during the selected date range.", + "filter_": "Filter...", + "all_rights_reserved": "© {pre}-{current} All Rights Reserved.", + "congrats_your_account_has_been_created_and_invited": "Congrats! Your account has been created and invited to {organization_name} organization successfully.", + "it_s_time_to_make_your_accounting_really_simple": "It's time to make your accounting really simple!", + "while_we_set_up_your_account_please_remember_to_verify_your_account": "while we set up your account, please remember to verify your account by clicking on the link we sent to your registered email address", + "something_went_wrong": "Something went wrong!", + "please_refresh_the_page": "Please refresh the page", + "waiting_to_redirect": "Waiting to redirect", + "refresh_the_page_if_redirect_not_worked": "Refresh the page if redirect not worked." } \ No newline at end of file