From 536c4a32fb4847f0ab7c6f078a9f9c72fbbe9fb9 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Mon, 7 Jun 2021 15:31:14 +0200 Subject: [PATCH] feat : lang --- client/src/components/ContactsSuggestField.js | 3 ++- .../PaymentViaVoucherForm.js | 9 +++---- .../Currencies/CurrenciesActions.js | 27 ++++++++----------- .../containers/Subscriptions/LicenseTab.js | 8 ++++-- client/src/lang/en/index.json | 4 ++- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/client/src/components/ContactsSuggestField.js b/client/src/components/ContactsSuggestField.js index 3e5b8ecad..0db5f5184 100644 --- a/client/src/components/ContactsSuggestField.js +++ b/client/src/components/ContactsSuggestField.js @@ -5,12 +5,13 @@ import { Suggest } from '@blueprintjs/select'; import { FormattedMessage as T } from 'react-intl'; import classNames from 'classnames'; import { CLASSES } from 'common/classes'; +import { formatMessage } from 'services/intl'; export default function ContactsSuggestField({ contactsList, initialContactId, selectedContactId, - defaultTextSelect = 'Select contact', + defaultTextSelect = formatMessage({id:'select_contact'}), onContactSelected, selectedContactType = [], diff --git a/client/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherForm.js b/client/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherForm.js index 5ce741460..17207498f 100644 --- a/client/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherForm.js +++ b/client/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherForm.js @@ -10,7 +10,6 @@ import { useAutofocus } from 'hooks'; import withDialogActions from 'containers/Dialog/withDialogActions'; - /** * Payment via license form. */ @@ -31,7 +30,9 @@ function PaymentViaLicenseForm({ return (
-

Please enter your preferred payment method below.

+

+ +

{({ field, meta: { error, touched } }) => ( @@ -72,6 +73,4 @@ function PaymentViaLicenseForm({ ); } -export default compose( - withDialogActions -)(PaymentViaLicenseForm); \ No newline at end of file +export default compose(withDialogActions)(PaymentViaLicenseForm); diff --git a/client/src/containers/Preferences/Currencies/CurrenciesActions.js b/client/src/containers/Preferences/Currencies/CurrenciesActions.js index 1e263dea3..83fd3b124 100644 --- a/client/src/containers/Preferences/Currencies/CurrenciesActions.js +++ b/client/src/containers/Preferences/Currencies/CurrenciesActions.js @@ -1,15 +1,11 @@ -import React, {useCallback} from 'react'; -import { - Button, - Intent, -} from '@blueprintjs/core'; +import React, { useCallback } from 'react'; +import { Button, Intent } from '@blueprintjs/core'; import Icon from 'components/Icon'; import withDialogActions from 'containers/Dialog/withDialogActions'; -import {compose} from 'utils'; +import { compose } from 'utils'; +import { FormattedMessage as T } from 'react-intl'; -function CurrenciesActions({ - openDialog, -}) { +function CurrenciesActions({ openDialog }) { const handleClickNewCurrency = useCallback(() => { openDialog('currency-form'); }, [openDialog]); @@ -17,15 +13,14 @@ function CurrenciesActions({ return (
-
+
); } -export default compose( - withDialogActions, -)(CurrenciesActions); \ No newline at end of file +export default compose(withDialogActions)(CurrenciesActions); diff --git a/client/src/containers/Subscriptions/LicenseTab.js b/client/src/containers/Subscriptions/LicenseTab.js index 8143a4fab..a66192884 100644 --- a/client/src/containers/Subscriptions/LicenseTab.js +++ b/client/src/containers/Subscriptions/LicenseTab.js @@ -28,8 +28,12 @@ function LicenseTab({ openDialog }) {

- ); diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json index 061a7dc34..7d271b283 100644 --- a/client/src/lang/en/index.json +++ b/client/src/lang/en/index.json @@ -999,5 +999,7 @@ "invoice": "Invoice", "receipt_": "Receipt", "receipt_no": "Receipt No.", - "receipt_amount": "Receipt amount" + "receipt_amount": "Receipt amount", + "please_enter_your_preferred_payment_method_below": "Please enter your preferred payment method below.", + "submit_voucher": "Submit Voucher", } \ No newline at end of file