diff --git a/client/src/components/Preferences/PreferencesSidebar.js b/client/src/components/Preferences/PreferencesSidebar.js index 9f41daaca..8c5d3f9d5 100644 --- a/client/src/components/Preferences/PreferencesSidebar.js +++ b/client/src/components/Preferences/PreferencesSidebar.js @@ -1,6 +1,7 @@ import React from 'react'; import { Menu, MenuItem, MenuDivider } from '@blueprintjs/core'; import { useHistory, useLocation } from 'react-router-dom'; +import { FormattedMessage as T } from 'react-intl'; import preferencesMenu from 'config/preferencesMenu'; import PreferencesSidebarContainer from './PreferencesSidebarContainer'; @@ -32,7 +33,7 @@ export default function PreferencesSidebar() { return (
-

Preferences

+

{}

{items} diff --git a/client/src/containers/Preferences/Accountant/AccountantForm.js b/client/src/containers/Preferences/Accountant/AccountantForm.js index 3a7c86a08..71763cc45 100644 --- a/client/src/containers/Preferences/Accountant/AccountantForm.js +++ b/client/src/containers/Preferences/Accountant/AccountantForm.js @@ -48,7 +48,11 @@ export default function AccountantForm() { + } name={'account_code_required'} {...field} /> @@ -62,7 +66,11 @@ export default function AccountantForm() { } name={'account_code_unique'} {...field} @@ -115,7 +123,11 @@ export default function AccountantForm() { } helperText={ - 'Select a preferred account to deposit into it after customer make payment.' + } labelInfo={} intent={inputIntent({ error, touched })} @@ -147,7 +159,11 @@ export default function AccountantForm() { } helperText={ - 'Select a preferred account to deposit into it after customer make payment.' + } labelInfo={} intent={inputIntent({ error, touched })} @@ -178,7 +194,11 @@ export default function AccountantForm() { } helperText={ - 'Select a preferred account to deposit into it vendor advanced deposits.' + } labelInfo={} intent={inputIntent({ error, touched })} diff --git a/client/src/containers/Preferences/General/GeneralForm.js b/client/src/containers/Preferences/General/GeneralForm.js index 856a9a8e5..1f3352111 100644 --- a/client/src/containers/Preferences/General/GeneralForm.js +++ b/client/src/containers/Preferences/General/GeneralForm.js @@ -44,7 +44,7 @@ export default function PreferencesGeneralForm({}) { inline={true} intent={inputIntent({ error, touched })} className={'form-group--org-name'} - helperText={'Shown on sales forms and purchase orders.'} + helperText={} > @@ -59,9 +59,7 @@ export default function PreferencesGeneralForm({}) { inline={true} intent={inputIntent({ error, touched })} className={classNames('form-group--select-list', CLASSES.FILL)} - helperText={ - 'For reporting, you can specify any month as the start of your financial year (also called your financial reporting year or accounting year).' - } + helperText={} > } > } helperText={ - 'Select a preferred account to deposit into it after customer make payment.' + } labelInfo={} intent={inputIntent({ error, touched })} @@ -70,7 +74,11 @@ export default function ItemForm() { } helperText={ - 'Select a preferred account to deposit into it after customer make payment.' + } labelInfo={} intent={inputIntent({ error, touched })} @@ -102,7 +110,11 @@ export default function ItemForm() { } helperText={ - 'Select a preferred account to deposit into it vendor advanced deposits.' + } labelInfo={} intent={inputIntent({ error, touched })} diff --git a/client/src/containers/Preferences/Users/Users.js b/client/src/containers/Preferences/Users/Users.js index 31ec33693..7f8212bcc 100644 --- a/client/src/containers/Preferences/Users/Users.js +++ b/client/src/containers/Preferences/Users/Users.js @@ -1,8 +1,9 @@ import React from 'react'; import { Tabs, Tab } from '@blueprintjs/core'; +import { formatMessage } from 'services/intl'; import classNames from 'classnames'; -import 'style/pages/Preferences/Users.scss' +import 'style/pages/Preferences/Users.scss'; import { CLASSES } from 'common/classes'; import PreferencesSubContent from 'components/Preferences/PreferencesSubContent'; @@ -16,15 +17,17 @@ function UsersPreferences({ openDialog }) { const onChangeTabs = (currentTabId) => {}; return ( -
+
- - + +
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json index ac742d548..f3aae6f4a 100644 --- a/client/src/lang/en/index.json +++ b/client/src/lang/en/index.json @@ -973,6 +973,14 @@ "summerize_how_much_each_customer_owes_your_business":"Summarize how much each customer owes your business.", "duplicate_customer":"Duplicate customer", "duplicate_vendor":"Duplicate vendor", -"new_billing":"New Billing" +"new_billing":"New Billing", +"shown_on_sales_forms_and_purchase_orders":"Shown on sales forms and purchase orders.", +"for_reporting_you_can_specify_any_month":"For reporting, you can specify any month as the start of your financial year (also called your financial reporting year or accounting year).", +"you_can_t_change_the_base_currency_as_there_are_transactions":"You can't change the base currency as there are transactions recorded in your organization.", +"make_account_code_required_when_create_a_new_accounts":"Make account code required when create a new accounts.", +"should_account_code_be_unique_when_create_a_new_account":"Should account code be unique when create a new account.", +"select_a_preferred_account_to_deposit_into_it_after_customer_make_payment":"Select a preferred account to deposit into it after customer make payment.", +"select_a_preferred_account_to_deposit_into_it_vendor_advanced_deposits":"Select a preferred account to deposit into it vendor advanced deposits.", +"roles":"Roles" }