Merge remote-tracking branch 'origin/feature/breadcrumb/fix_localize'

This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
78 changed files with 833 additions and 538 deletions

View File

@@ -68,7 +68,7 @@ function ExchangeRate({
requestDeleteExchangeRate(deleteExchangeRate.id).then(() => {
setDeleteExchangeRate(false);
AppToaster.show({
message: 'the_exchange_rate_has_been_delete',
message: formatMessage({id:'the_exchange_rate_has_been_successfully_deleted'}),
});
});
}, [deleteExchangeRate, requestDeleteExchangeRate]);

View File

@@ -19,7 +19,7 @@ import FilterDropdown from 'components/FilterDropdown';
import withResourceDetail from 'containers/Resources/withResourceDetails';
import { compose } from 'utils';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T ,useIntl } from 'react-intl';
function ExchangeRateActionsBar({
@@ -36,6 +36,7 @@ function ExchangeRateActionsBar({
onBulkDelete
}) {
const [filterCount, setFilterCount] = useState(0);
const {formatMessage} =useIntl()
const onClickNewExchangeRate = () => {
openDialog('exchangeRate-form', {});
@@ -86,7 +87,7 @@ function ExchangeRateActionsBar({
filterCount <= 0 ? (
<T id={'filter'} />
) : (
`${filterCount} filters applied`
`${filterCount} ${formatMessage({id:'filters_applied'})}`
)
}
icon={<Icon icon='filter' />}