gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2434

Browse Source
This commit is contained in:
James Cole
2019-08-17 08:29:35 +02:00
parent b97d3d3627
commit 79cf61b653
10 changed files with 259 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
resources/lang/en_US/firefly.php
View File

@@ -756,32 +756,33 @@ return [
'start_of_reconcile_period' => 'Start of reconcile period: :period',
'start_balance' => 'Start balance',
'end_balance' => 'End balance',
'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
'update_selection' => 'Update selection',
'store_reconcile' => 'Store reconciliation',
'reconciliation_transaction' => 'Reconciliation transaction',
'Reconciliation' => 'Reconciliation',
'reconciliation' => 'Reconciliation',
'reconcile_options' => 'Reconciliation options',
'reconcile_range' => 'Reconciliation range',
'start_reconcile' => 'Start reconciling',
'cash_account_type' => 'Cash',
'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
'updated_account' => 'Updated account ":name"',
'credit_card_options' => 'Credit card options',
'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
'no_transactions_period' => 'There are no transactions (in this period).',
'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
'select_at_least_one_account' => 'Please select at least one asset account',
'select_at_least_one_category' => 'Please select at least one category',
'select_at_least_one_budget' => 'Please select at least one budget',
'select_at_least_one_tag' => 'Please select at least one tag',
'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
'update_selection' => 'Update selection',
'store_reconcile' => 'Store reconciliation',
'reconciliation_transaction' => 'Reconciliation transaction',
'Reconciliation' => 'Reconciliation',
'reconciliation' => 'Reconciliation',
'reconcile_options' => 'Reconciliation options',
'reconcile_range' => 'Reconciliation range',
'start_reconcile' => 'Start reconciling',
'cash_account_type' => 'Cash',
'cash' => 'cash',
'cant_find_redirect_account' => 'Firefly III tried to redirect you but couldn\'t. Sorry about that. Back to the index.',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
'updated_account' => 'Updated account ":name"',
'credit_card_options' => 'Credit card options',
'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
'no_transactions_period' => 'There are no transactions (in this period).',
'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
'select_at_least_one_account' => 'Please select at least one asset account',
'select_at_least_one_category' => 'Please select at least one category',
'select_at_least_one_budget' => 'Please select at least one budget',
'select_at_least_one_tag' => 'Please select at least one tag',
'select_at_least_one_expense' => 'Please select at least one combination of expense/revenue accounts. If you have none (the list is empty) this report is not available.',
'account_default_currency' => 'This will be the default currency associated with this account.',
'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',

3
resources/views/v1/transactions/show.twig
View File

@@ -176,7 +176,7 @@
title="{{ journal.source_iban|default(journal.source_name) }}">{{ journal.source_name }}</a> &rarr;
{% if type == 'Withdrawal' or type == 'Deposit' %}
{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
{% elseif type == 'Transfer' %}
{% elseif type == 'Transfer' or type == 'Opening balance' %}
<span class="text-info">
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places, false) }}
</span>
@@ -193,7 +193,6 @@
{% endif %}
{% endif %}
&rarr;
<a href="{{ route('accounts.show', journal.destination_id) }}"
title="{{ journal.destination_iban|default(journal.destination_name) }}">{{ journal.destination_name }}</a>