Merge pull request #619 from bigcapitalhq/change-banking-service-language

feat: change banking service language

packages/webapp/src/components/BankAccounts/index.tsx

@@ -80,7 +80,7 @@ export function BankAccount({
       <BankAccountMeta>
         {uncategorizedTransactionsCount > 0 && (
           <BankAccountMetaLine
-            title={intl.get('cash_flow.transactions_for_review')}
+            title={intl.get('banking.transactions_for_review')}
             value={uncategorizedTransactionsCount}
             className={clsx({ [Classes.SKELETON]: loading })}
           />

packages/webapp/src/constants/cashflowOptions.tsx

@@ -3,30 +3,30 @@ import intl from 'react-intl-universal';
 
 export const getAddMoneyInOptions = () => [
   {
-    name: intl.get('cash_flow.owner_contribution'),
+    name: intl.get('banking.owner_contribution'),
     value: 'owner_contribution',
   },
   {
-    name: intl.get('cash_flow.other_income'),
+    name: intl.get('banking.other_income'),
     value: 'other_income',
   },
   {
-    name: intl.get('cash_flow.transfer_form_account'),
+    name: intl.get('banking.transfer_form_account'),
     value: 'transfer_from_account',
   },
 ];
 
 export const getAddMoneyOutOptions = () => [
   {
-    name: intl.get('cash_flow.owner_drawings'),
+    name: intl.get('banking.owner_drawings'),
     value: 'OwnerDrawing',
   },
   {
-    name: intl.get('cash_flow.expenses'),
+    name: intl.get('banking.expenses'),
     value: 'other_expense',
   },
   {
-    name: intl.get('cash_flow.transfer_to_account'),
+    name: intl.get('banking.transfer_to_account'),
     value: 'transfer_to_account',
   },
 ];

packages/webapp/src/constants/sidebarMenu.tsx

@@ -441,12 +441,12 @@ export const SidebarMenu = [
   // # Cashflow
   // ---------------
   {
-    text: <T id={'siebar.cashflow'} />,
+    text: <T id={'sidebar.banking'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Cashflow,
     children: [
       {
-        text: <T id={'siebar.cashflow'} />,
+        text: <T id={'sidebar.banking'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx

@@ -227,7 +227,7 @@ function AccountTransactionsActionsBar({
         <CashFlowMenuItems
           items={addMoneyInOptions}
           onItemSelect={handleMoneyInFormTransaction}
-          text={<T id={'cash_flow.label.add_money_in'} />}
+          text={<T id={'banking.label.add_money_in'} />}
           buttonProps={{
             icon: <Icon icon={'arrow-downward'} iconSize={20} />,
           }}
@@ -235,7 +235,7 @@ function AccountTransactionsActionsBar({
         <CashFlowMenuItems
           items={addMoneyOutOptions}
           onItemSelect={handlMoneyOutFormTransaction}
-          text={<T id={'cash_flow.label.add_money_out'} />}
+          text={<T id={'banking.label.add_money_out'} />}
           buttonProps={{
             icon: <Icon icon={'arrow-upward'} iconSize={20} />,
           }}

packages/webapp/src/containers/CashFlow/AccountTransactions/PendingTransactions/_hooks.tsx

@@ -41,7 +41,7 @@ export function usePendingTransactionsTableColumns() {
       },
       {
         id: 'deposit',
-        Header: intl.get('cash_flow.label.deposit'),
+        Header: intl.get('banking.label.deposit'),
         accessor: 'formatted_deposit_amount',
         width: 40,
         className: 'deposit',
@@ -51,7 +51,7 @@ export function usePendingTransactionsTableColumns() {
       },
       {
         id: 'withdrawal',
-        Header: intl.get('cash_flow.label.withdrawal'),
+        Header: intl.get('banking.label.withdrawal'),
         accessor: 'formatted_withdrawal_amount',
         className: 'withdrawal',
         width: 40,

packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/hooks.tsx

@@ -121,7 +121,7 @@ export function useAccountUncategorizedTransactionsColumns() {
       },
       {
         id: 'deposit',
-        Header: intl.get('cash_flow.label.deposit'),
+        Header: intl.get('banking.label.deposit'),
         accessor: 'formatted_deposit_amount',
         width: 40,
         className: 'deposit',
@@ -131,7 +131,7 @@ export function useAccountUncategorizedTransactionsColumns() {
       },
       {
         id: 'withdrawal',
-        Header: intl.get('cash_flow.label.withdrawal'),
+        Header: intl.get('banking.label.withdrawal'),
         accessor: 'formatted_withdrawal_amount',
         className: 'withdrawal',
         width: 40,

packages/webapp/src/containers/CashFlow/AccountTransactions/components.tsx

@@ -116,7 +116,7 @@ export function useAccountTransactionsColumns() {
       },
       {
         id: 'deposit',
-        Header: intl.get('cash_flow.label.deposit'),
+        Header: intl.get('banking.label.deposit'),
         accessor: 'formatted_deposit',
         width: 110,
         className: 'deposit',
@@ -126,7 +126,7 @@ export function useAccountTransactionsColumns() {
       },
       {
         id: 'withdrawal',
-        Header: intl.get('cash_flow.label.withdrawal'),
+        Header: intl.get('banking.label.withdrawal'),
         accessor: 'formatted_withdrawal',
         className: 'withdrawal',
         width: 150,
@@ -136,7 +136,7 @@ export function useAccountTransactionsColumns() {
       },
       {
         id: 'running_balance',
-        Header: intl.get('cash_flow.label.running_balance'),
+        Header: intl.get('banking.label.running_balance'),
         accessor: 'formatted_running_balance',
         className: 'running_balance',
         width: 150,

packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.tsx

@@ -78,13 +78,13 @@ function CashFlowAccountsActionsBar({
           <Button
             className={Classes.MINIMAL}
             icon={<Icon icon={'plus-24'} iconSize={20} />}
-            text={<T id={'cash_flow.label.add_cash_account'} />}
+            text={<T id={'banking.label.add_cash_account'} />}
             onClick={handleAddBankAccount}
           />
           <Button
             className={Classes.MINIMAL}
             icon={<Icon icon={'plus-24'} iconSize={20} />}
-            text={<T id={'cash_flow.label.add_bank_account'} />}
+            text={<T id={'banking.label.add_bank_account'} />}
             onClick={handleAddCashAccount}
           />
           <NavbarDivider />

packages/webapp/src/lang/ar/index.json

@@ -1386,22 +1386,22 @@
   "vendors.option_without_zero_balance.hint": "Include vendors and exclude that ones have zero-balance.",
   "vendors.option_with_transactions": "Vendors with transactions",
   "vendors.option_with_transactions.hint": "Include vendors that onces have transactions on the given date period only.",
-  "siebar.cashflow": "التدفق النقدي",
+  "sidebar.banking": "التدفق النقدي",
-  "siebar.cashflow.label_cash_and_bank_accounts": "حسابات نقدية والمصارف ",
+  "siebar.banking.bank_accounts": "حسابات نقدية والمصارف ",
-  "cash_flow.label_account_transcations": "معاملات الحساب",
+  "banking.label_account_transcations": "معاملات الحساب",
-  "cash_flow.label.deposit": "الإيداع",
+  "banking.label.deposit": "الإيداع",
-  "cash_flow.label.withdrawal": "السحب",
+  "banking.label.withdrawal": "السحب",
-  "cash_flow.label.running_balance": "الرصيد التحليلي",
+  "banking.label.running_balance": "الرصيد التحليلي",
-  "cash_flow.label.add_cash_account": "اضافة حساب نقدية",
+  "banking.label.add_cash_account": "اضافة حساب نقدية",
-  "cash_flow.label.add_bank_account": "اضافة حساب مصرف",
+  "banking.label.add_bank_account": "اضافة حساب مصرف",
-  "cash_flow.label.add_money_in": "إيداع إلي الحساب",
+  "banking.label.add_money_in": "إيداع إلي الحساب",
-  "cash_flow.label.add_money_out": "سحب من الحساب",
+  "banking.label.add_money_out": "سحب من الحساب",
-  "cash_flow.owner_contribution": "زيادة رأس المال",
+  "banking.owner_contribution": "زيادة رأس المال",
-  "cash_flow.other_income": "إيراد أخر",
+  "banking.other_income": "إيراد أخر",
-  "cash_flow.owner_drawings": "سحب رأس المال",
+  "banking.owner_drawings": "سحب رأس المال",
-  "cash_flow.expenses": "المصاريف",
+  "banking.expenses": "المصاريف",
-  "cash_flow.transfer_form_account": "تحويل من الحساب ",
+  "banking.transfer_form_account": "تحويل من الحساب ",
-  "cash_flow.transfer_to_account": "تحويل إلى الحساب ",
+  "banking.transfer_to_account": "تحويل إلى الحساب ",
   "cash_flow_transaction.label_equity_account": "حساب الملكية",
   "cash_flow_transaction.label_expense_account": " حساب المصاريف",
   "cash_flow_transaction_success_message": "تم إنشاء معاملة التدفق النقدي بنجاح.",

packages/webapp/src/lang/en/index.json

@@ -1350,26 +1350,26 @@
   "vendors.option_with_transactions": "Vendors with transactions",
   "vendors.option_with_transactions.hint": "Include vendors that onces have transactions on the given date period only.",
   "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
-  "siebar.cashflow": "Cash flow",
+  "sidebar.banking": "Banking",
-  "siebar.cashflow.label_cash_and_bank_accounts": "Cash & Bank Accounts",
+  "siebar.banking.bank_accounts": "Bank Accounts",
-  "cash_flow.label_account_transcations": "Account Transcations",
+  "banking.label_account_transcations": "Account Transcations",
-  "cash_flow.transactions_for_review": "Transactions for review",
+  "banking.transactions_for_review": "Transactions for review",
-  "cash_flow.label.deposit": "Deposit",
+  "banking.label.deposit": "Deposit",
-  "cash_flow.label.withdrawal": "Withdrawal",
+  "banking.label.withdrawal": "Withdrawal",
-  "cash_flow.label.running_balance": "Running balance",
+  "banking.label.running_balance": "Running balance",
-  "cash_flow.label.add_cash_account": "Add Cash account",
+  "banking.label.add_cash_account": "Add Cash account",
-  "cash_flow.label.add_bank_account": "Add Bank account",
+  "banking.label.add_bank_account": "Add Bank account",
-  "cash_flow.label.add_money_in": "Add Money In",
+  "banking.label.add_money_in": "Add Money In",
-  "cash_flow.label.add_money_out": "Add Money Out",
+  "banking.label.add_money_out": "Add Money Out",
-  "cash_flow.owner_contribution": "Owner contribution",
+  "banking.owner_contribution": "Owner contribution",
-  "cash_flow.other_income": "Other income",
+  "banking.other_income": "Other income",
-  "cash_flow.owner_drawings": "Owner drawings",
+  "banking.owner_drawings": "Owner drawings",
-  "cash_flow.expenses": "Expenses",
+  "banking.expenses": "Expenses",
-  "cash_flow.transfer_form_account": "Transfer from account",
+  "banking.transfer_form_account": "Transfer from account",
-  "cash_flow.transfer_to_account": "Transfer to account",
+  "banking.transfer_to_account": "Transfer to account",
   "cash_flow_transaction.label_equity_account": "Equity account",
   "cash_flow_transaction.label_expense_account": "Expense account",
-  "cash_flow_transaction_success_message": "The cashflow transaction has been created successfully.",
+  "cash_flow_transaction_success_message": "The bank transaction has been created successfully.",
   "cash_flow_transaction.money_in": "Money In {value}",
   "cash_flow_transaction.money_out": "Money Out {value}",
   "cash_flow_transaction.other_income_account": "Other income account",
@@ -1389,7 +1389,7 @@
   "cash_flow.drawer.label_transaction": "Cash flow Transaction {number}",
   "cash_flow.account_transactions.no_results": "There are no deposit/withdrawal transactions on the current account.",
   "cash_flow_balance_in": "Balance in {name}",
-  "cash_flow.accounts.no_results": "There are no cashflow accounts with current filter criteria.",
+  "cash_flow.accounts.no_results": "There are no bank accounts with current filter criteria.",
   "cash_flow_money_in": "Money In",
   "cash_flow_money_out": "Money Out",
   "cash_flow_transaction.switch_item": "Transactions {value}",
@@ -1702,7 +1702,7 @@
   "permissions.vendors_summary_balance": "Vendors summary balance",
   "permissions.inventory_valuation_summary": "Inventory valuation summary",
   "permissions.inventory_items_details": "Inventory valuation summary",
-  "permissions.cashflow_account_transactions": "Cashflow account transactions",
+  "permissions.cashflow_account_transactions": "Bank account transactions",
   "permissions.more_permissions": "More Permissions",
   "estimate.status.expired": "Expired",
   "refund_credit.drawer.title": "Refund credit note",

packages/webapp/src/routes/dashboard.tsx

@@ -1162,7 +1162,7 @@ export const getDashboardRoutes = () => [
     ),
     sidebarExpand: false,
     backLink: true,
-    pageTitle: intl.get('cash_flow.label_account_transcations'),
+    pageTitle: intl.get('banking.label_account_transcations'),
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
     defaultSearchResource: RESOURCES_TYPES.ACCOUNT,
   },
@@ -1186,7 +1186,7 @@ export const getDashboardRoutes = () => [
       () =>
         import('@/containers/CashFlow/CashFlowAccounts/CashFlowAccountsList'),
     ),
-    pageTitle: intl.get('siebar.cashflow.label_cash_and_bank_accounts'),
+    pageTitle: intl.get('siebar.banking.bank_accounts'),
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
     defaultSearchResource: RESOURCES_TYPES.ACCOUNT,
   },