WIP / Fix_ExchangeRate / localize

client/src/containers/Accounting/MakeJournalEntriesForm.js

@@ -21,14 +21,19 @@ import MediaConnect from 'connectors/Media.connect';
 import useMedia from 'hooks/useMedia';
 import {compose} from 'utils';
 
+import { FormattedMessage as T, useIntl } from 'react-intl';
+
 
 function MakeJournalEntriesForm({
+  // #withMedia
   requestSubmitMedia,
   requestDeleteMedia,
 
+  // #withJournalsActions
   requestMakeJournalEntries,
   requestEditManualJournal,
 
+  // #withDashboard
   changePageTitle,
   changePageSubtitle,
 
@@ -47,13 +52,14 @@ function MakeJournalEntriesForm({
 
   const savedMediaIds = useRef([]);
   const clearSavedMediaIds = () => { savedMediaIds.current = []; }
+const {formatMessage}  =useIntl()
 
   useEffect(() => {
     if (manualJournal && manualJournal.id) {
-      changePageTitle('Edit Journal');
+      changePageTitle(formatMessage({id:'edit_journal'}));
       changePageSubtitle(`No. ${manualJournal.journal_number}`);
     } else {
-      changePageTitle('New Journal');  
+      changePageTitle(formatMessage({id:'new_journal'}));  
     }
   }, [changePageTitle, changePageSubtitle, manualJournal]);
 
@@ -252,8 +258,6 @@ function MakeJournalEntriesForm({
 }
 
 export default compose(
-  // ManualJournalsConnect,
-  // MakeJournalEntriesConnect,
   withJournalsActions,
   withManualJournalDetail,
   withAccountsActions,

client/src/containers/Accounting/ManualJournalsList.js

@@ -22,22 +22,24 @@ import { compose } from 'utils';
  * Manual journals table.
  */
 function ManualJournalsTable({
+  // #withDashboardActions
   changePageTitle,
 
+  // #withViewsActions
   requestFetchResourceViews,
 
+  // #withManualJournalsActions
   requestFetchManualJournalsTable,
   requestDeleteManualJournal,
   requestPublishManualJournal,
   requestDeleteBulkManualJournals,
-
   addManualJournalsTableQueries,
 }) {
   const history = useHistory();
   const [deleteManualJournal, setDeleteManualJournal] = useState(false);
   const [selectedRows, setSelectedRows] = useState([]);
   const [bulkDelete, setBulkDelete] = useState(false);
-
+  const { formatMessage } = useIntl();
   const fetchViews = useQuery('journals-resource-views', () => {
     return requestFetchResourceViews('manual_journals');
   });
@@ -47,7 +49,7 @@ function ManualJournalsTable({
   );
 
   useEffect(() => {
-    changePageTitle('Manual Journals');
+    changePageTitle(formatMessage({id:'manual_journals'}));
   }, [changePageTitle]);
 
   // Handle delete manual journal click.
@@ -163,9 +165,7 @@ function ManualJournalsTable({
               '/dashboard/accounting/manual-journals/:custom_view_id/custom_view',
               '/dashboard/accounting/manual-journals',
             ]}
-          >
-            <ManualJournalsViewTabs onViewChanged={handleViewChanged} />
-          </Route>
+          ></Route>
         </Switch>
 
         <ManualJournalsDataTable