Merge branch 'feature/i18n-arabic' of https://github.com/abouolia/Ratteb into feature/i18n-arabic

This commit is contained in:
a.bouhuolia
2021-06-13 14:03:42 +02:00
21 changed files with 166 additions and 59 deletions

View File

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import WorkflowIcon from './WorkflowIcon';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import withOrganizationActions from 'containers/Organization/withOrganizationActions';
import 'style/pages/Setup/Congrats.scss';

View File

@@ -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() {
<div className={'setup-initializing-form__title'}>
{isLoading ? (
<>
<h1>It's time to make your accounting really simple!</h1>
<h1>
<T id={'it_s_time_to_make_your_accounting_really_simple'} />
</h1>
<p className={'paragraph'}>
while we set up your account, please remember to verify your
account by clicking on the link we sent to yout registered email
address
<T
id={
'while_we_set_up_your_account_please_remember_to_verify_your_account'
}
/>
</p>
</>
) : isError ? (
<>
<h1>Something went wrong!</h1>
<p class="paragraph">Please refresh the page</p>
<h1>
<T id={'something_went_wrong'} />
</h1>
<p class="paragraph">
<T id={'please_refresh_the_page'} />
</p>
</>
) : (
<>
<h1>Waiting to redirect</h1>
<p class="paragraph">Refresh the page if redirect not worked.</p>
<h1>
<T id={'waiting_to_redirect'} />
</h1>
<p class="paragraph">
<T id={'refresh_the_page_if_redirect_not_worked'} />
</p>
</>
)}
</div>

View File

@@ -98,7 +98,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
>
<ListSelect
items={currencies}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
popoverProps={{ minimal: true }}
onItemSelect={(item) => {
setFieldValue('baseCurrency', item.code);
@@ -133,7 +133,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
>
<ListSelect
items={languages}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
onItemSelect={(item) => {
setFieldValue('language', item.value);
}}
@@ -165,7 +165,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
>
<ListSelect
items={fiscalYearOptions}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
selectedItem={value}
selectedItemProp={'value'}
textProp={'name'}