diff --git a/client/src/common/countries.js b/client/src/common/countries.js index cf08fcf48..a59814af5 100644 --- a/client/src/common/countries.js +++ b/client/src/common/countries.js @@ -1,5 +1,3 @@ +import { formatMessage } from 'services/intl'; - -export default [ - { name: 'Libya', value: 'libya' }, -] \ No newline at end of file +export default [{ name: formatMessage({ id: 'libya' }), value: 'libya' }]; diff --git a/client/src/common/dateFormatsOptions.js b/client/src/common/dateFormatsOptions.js index bed2cda21..dae7baf97 100644 --- a/client/src/common/dateFormatsOptions.js +++ b/client/src/common/dateFormatsOptions.js @@ -1,40 +1,41 @@ import moment from 'moment'; +import { formatMessage } from 'services/intl'; export default [ { id: 1, - name: 'MM/DD/YY', + name: formatMessage({ id: 'mm_dd_yy' }), label: `${moment().format('MM/DD/YYYY')}`, value: 'mm/dd/yy', }, { id: 2, - name: 'DD/MM/YY', + name: formatMessage({ id: 'dd_mm_yy' }), label: `${moment().format('DD/MM/YYYY')}`, value: 'dd/mm/yy', }, { id: 3, - name: 'YY/MM/DD', + name: formatMessage({ id: 'yy_mm_dd' }), label: `${moment().format('YYYY/MM/DD')}`, value: 'yy/mm/dd', }, { id: 4, - name: 'MM-DD-YY', + name: formatMessage({ id: 'mm_dd_yy' }), label: `${moment().format('MM-DD-YYYY')}`, value: 'mm-dd-yy', }, { id: 5, - name: 'DD-MM-YY', + name: formatMessage({ id: 'dd_mm_yy_' }), label: `${moment().format('DD-MM-YYYY')}`, value: 'dd-mm-yy', }, { id: 6, - name: 'YY-MM-DD', + name: formatMessage({ id: 'yy_mm_dd_' }), label: `${moment().format('YYYY-MM-DD')}`, value: 'yy-mm-dd', }, -] \ No newline at end of file +]; diff --git a/client/src/components/AccountsSuggestField.js b/client/src/components/AccountsSuggestField.js index bdd1742a5..38694ad07 100644 --- a/client/src/components/AccountsSuggestField.js +++ b/client/src/components/AccountsSuggestField.js @@ -6,6 +6,8 @@ import classNames from 'classnames'; import { CLASSES } from 'common/classes'; import { FormattedMessage as T } from 'react-intl'; +import { formatMessage } from 'services/intl'; + import { filterAccountsByQuery } from './utils'; /** @@ -15,7 +17,7 @@ export default function AccountsSuggestField({ accounts, initialAccountId, selectedAccountId, - defaultSelectText = 'Select account', + defaultSelectText = formatMessage({ id: 'select_account' }), popoverFill = false, onAccountSelected, @@ -32,7 +34,7 @@ export default function AccountsSuggestField({ filterByRootTypes, filterByParentTypes, filterByTypes, - filterByNormal, + filterByNormal, }); return filteredAccounts; }, [ diff --git a/client/src/components/DataTableCells/AccountsListFieldCell.js b/client/src/components/DataTableCells/AccountsListFieldCell.js index 724cf2753..29cb6e5fe 100644 --- a/client/src/components/DataTableCells/AccountsListFieldCell.js +++ b/client/src/components/DataTableCells/AccountsListFieldCell.js @@ -1,6 +1,7 @@ import React, { useRef, useCallback, useMemo } from 'react'; import classNames from 'classnames'; import { useCellAutoFocus } from 'hooks'; +import { formatMessage } from 'services/intl'; import AccountsSuggestField from 'components/AccountsSuggestField'; @@ -61,6 +62,7 @@ export default function AccountCellRenderer({ filterByTypes={filterAccountsByTypes} inputProps={{ inputRef: (ref) => (accountRef.current = ref), + placeholder: formatMessage({ id: 'search' }), }} openOnKeyDown={true} blurOnSelectClose={false} diff --git a/client/src/components/SalutationList.js b/client/src/components/SalutationList.js index ba9661026..dd57dbbc6 100644 --- a/client/src/components/SalutationList.js +++ b/client/src/components/SalutationList.js @@ -4,7 +4,13 @@ import { formatMessage } from 'services/intl'; import { ListSelect } from 'components'; export default function SalutationList({ ...restProps }) { - const saluations = ['Mr.', 'Mrs.', 'Ms.', 'Miss', 'Dr.']; + const saluations = [ + formatMessage({ id: 'mr' }), + formatMessage({ id: 'mrs' }), + formatMessage({ id: 'ms' }), + formatMessage({ id: 'miss' }), + formatMessage({ id: 'dr' }), + ]; const items = saluations.map((saluation) => ({ key: saluation, label: saluation, diff --git a/client/src/containers/Accounts/AccountsViewsTabs.js b/client/src/containers/Accounts/AccountsViewsTabs.js index 978b11eaf..fee0ff257 100644 --- a/client/src/containers/Accounts/AccountsViewsTabs.js +++ b/client/src/containers/Accounts/AccountsViewsTabs.js @@ -1,6 +1,8 @@ import React, { useMemo, useCallback } from 'react'; import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { pick } from 'lodash'; +import { formatMessage } from 'services/intl'; + import { DashboardViewsTabs } from 'components'; import { useAccountsChartContext } from 'containers/Accounts/AccountsChartProvider'; @@ -45,7 +47,7 @@ function AccountsViewsTabs({ ( )} diff --git a/client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFields.js b/client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFields.js index 56ecb2276..0399c2d1b 100644 --- a/client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFields.js +++ b/client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFields.js @@ -39,7 +39,7 @@ export default function CurrencyFormFields() { meta: { error, touched }, }) => ( } className={classNames(CLASSES.FILL, 'form-group--type')} > } onItemSelect={(currency) => { setFieldValue('currency_code', currency.currency_code); setFieldValue('currency_name', currency.name); diff --git a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryGeneralPanel.js b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryGeneralPanel.js index 9ecdd7aa5..633c8807e 100644 --- a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryGeneralPanel.js +++ b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryGeneralPanel.js @@ -57,7 +57,7 @@ export default function CustomersBalanceSummaryGeneralPanel() { inline={true} name={'percentage'} small={true} - label={'Percentage Of Column'} + label={} {...field} /> diff --git a/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.js b/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.js index 52a700780..e83433740 100644 --- a/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.js +++ b/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.js @@ -54,7 +54,7 @@ function InventoryValuationActionsBar({ ); } -export default compose( - withOrganizationActions, -)(SetupCongratsPage); \ No newline at end of file +export default compose(withOrganizationActions)(SetupCongratsPage); diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json index 7af683d9e..def7bf7f8 100644 --- a/client/src/lang/en/index.json +++ b/client/src/lang/en/index.json @@ -909,7 +909,7 @@ "accounting": "Accounting", "system": "SYSTEM", "it_s_time_to_send_estimates_to_your_customers": "It's time to send estimates to your customers", - "it_is_a_long_established_fact_that_a_reader": " It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.", + "it_is_a_long_established_fact_that_a_reader": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.", "new_sale_estimate": "New sale estimate", "learn_more": "Learn more", "back_to_list": "Back to list.", @@ -1066,5 +1066,40 @@ "other_expenses": "Other expenses", "total_other_expenses": "Total other expenses", "net_other_income": "Net other income", - "net_income": "Net Income" + "net_income": "Net Income", + "services_that_you_provide_to_customers": " Service : Services that you provide to customers.", + "products_you_buy_and_or_sell": " Inventory : Products you buy and/or sell and that you track quantities of.", + "products_you_buy_and_or_sell_but_don_t_need": " Non-Inventory: Products you buy and/or sell but don’t need to (or can’t) track quantities of, for example, nuts and bolts used in an installation.", + "there_is_no_items_in_the_table_yet": "There is no items in the table yet.", + "congrats_you_are_ready_to_go": "Congrats! You are ready to go", + "go_to_dashboard": "Go to dashboard", + "mr": "Mr.", + "mrs": "Mrs.", + "ms": "Ms.", + "miss": "Miss.", + "dr": "Dr.", + "all_accounts_": "All Accounts", + "search": "Search...", + "starter": "Starter", + "sale_and_purchase_invoices": "Sale and purchase invoices.", + "customers_vendors_accounts": "Customers/vendors accounts.", + "expense_tracking": "Expense tracking.", + "for_one_user_and_accountant": "For one user and accountant.", + "all_capital_starter_features": "All Capital Starter features.", + "multi_currency": "Multi-currency.", + "purchase_and_sell_orders": "Purchase and sell orders.", + "inventory_management": "Inventory management.", + "three_users_with_your_accountant": "Three users with your accountant.", + "advanced_financial_reports": "Advanced financial reports.", + "all_capital_essential_features": "All Capital Essential features.", + "track_multi_branches_and_locations": "Track multi-branches and locations.", + "projects_accounting_and_timesheets": "Projects accounting and timesheets.", + "accounting_dimensions": "Accounting dimensions", + "libya": "Libya", + "mm_dd_yy": "MM/DD/YY", + "dd_mm_yy": "DD/MM/YY", + "yy_mm_dd": "YY/MM/DD", + "mm_dd_yy_": "MM-DD-YY", + "dd_mm_yy_": "DD-MM-YY", + "yy_mm_dd_": "YY-MM-DD" } \ No newline at end of file