Fix and clean up bank account translations for English and German
This commit is contained in:
parent
0564b18e22
commit
c559a31a9e
8 changed files with 149 additions and 35 deletions
|
|
@ -8,7 +8,7 @@ class Finance::BankAccountsController < Finance::BaseController
|
|||
def assign_unlinked_transactions
|
||||
@bank_account = BankAccount.find(params[:id])
|
||||
count = @bank_account.assign_unlinked_transactions
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), notice: t('finance.bank_accounts.controller.assign.notice', count: count)
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), notice: t('.notice', count: count)
|
||||
rescue => error
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), alert: t('errors.general_msg', msg: error.message)
|
||||
end
|
||||
|
|
@ -18,10 +18,10 @@ class Finance::BankAccountsController < Finance::BaseController
|
|||
import_method = @bank_account.find_import_method
|
||||
if import_method
|
||||
count = import_method.call(@bank_account)
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), notice: t('finance.bank_accounts.controller.import.notice', count: count)
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), notice: t('.notice', count: count)
|
||||
else
|
||||
# @todo add import for csv files as fallback
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), alert: t('finance.bank_accounts.controller.import.no_import_method')
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), alert: t('.no_import_method')
|
||||
end
|
||||
rescue => error
|
||||
redirect_to finance_bank_account_transactions_url(@bank_account), alert: t('errors.general_msg', msg: error.message)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class Finance::FinancialLinksController < Finance::BaseController
|
|||
bank_transaction = BankTransaction.find(params[:bank_transaction])
|
||||
bank_transaction.update_attribute :financial_link, @financial_link
|
||||
end
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.bank_transactions.controller.create.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def index_bank_transaction
|
||||
|
|
@ -51,13 +51,13 @@ class Finance::FinancialLinksController < Finance::BaseController
|
|||
def add_bank_transaction
|
||||
bank_transaction = BankTransaction.find(params[:bank_transaction])
|
||||
bank_transaction.update_attribute :financial_link, @financial_link
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.bank_transactions.controller.create.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def remove_bank_transaction
|
||||
bank_transaction = BankTransaction.find(params[:bank_transaction])
|
||||
bank_transaction.update_attribute :financial_link, nil
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.bank_transactions.controller.destroy.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def index_financial_transaction
|
||||
|
|
@ -67,13 +67,13 @@ class Finance::FinancialLinksController < Finance::BaseController
|
|||
def add_financial_transaction
|
||||
financial_transaction = FinancialTransaction.find(params[:financial_transaction])
|
||||
financial_transaction.update_attribute :financial_link, @financial_link
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.financial_transactions.controller.create.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def remove_financial_transaction
|
||||
financial_transaction = FinancialTransaction.find(params[:financial_transaction])
|
||||
financial_transaction.update_attribute :financial_link, nil
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.financial_transactions.controller.destroy.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def index_invoice
|
||||
|
|
@ -83,13 +83,13 @@ class Finance::FinancialLinksController < Finance::BaseController
|
|||
def add_invoice
|
||||
invoice = Invoice.find(params[:invoice])
|
||||
invoice.update_attribute :financial_link, @financial_link
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.financial_transactions.controller.create.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
def remove_invoice
|
||||
invoice = Invoice.find(params[:invoice])
|
||||
invoice.update_attribute :financial_link, nil
|
||||
redirect_to finance_link_url(@financial_link), notice: I18n.t('finance.financial_transactions.controller.destroy.notice')
|
||||
redirect_to finance_link_url(@financial_link), notice: t('.notice')
|
||||
end
|
||||
|
||||
protected
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
- content_for :actionbar do
|
||||
= link_to t('.assign_unlinked_transactions'), assign_unlinked_transactions_finance_bank_account_path(@bank_account), class: 'btn'
|
||||
= link_to t('.import_transaction'), import_finance_bank_account_path(@bank_account), class: 'btn btn-primary'
|
||||
= link_to t('.import_transactions'), import_finance_bank_account_path(@bank_account), class: 'btn btn-primary'
|
||||
|
||||
.well.well-small
|
||||
= form_tag finance_bank_account_transactions_path, :method => :get, :remote => true,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.modal-header
|
||||
= close_button :modal
|
||||
%h3= t('.add_invoice')
|
||||
%h3= t('.title')
|
||||
.modal-body
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.modal-header
|
||||
= close_button :modal
|
||||
%h3= t('.add_invoice')
|
||||
%h3= t('.title')
|
||||
.modal-body
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.modal-header
|
||||
= close_button :modal
|
||||
%h3= t('.add_invoice')
|
||||
%h3= t('.title')
|
||||
.modal-body
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue