kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Various small fixes.

Browse Source
This commit is contained in:
James Cole
2016-11-25 16:55:04 +01:00
parent 6c9990e0be
commit c049d5cfa6
8 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,6 +521,9 @@ return [
'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_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
'select_more_than_one_account' => 'Please select more than one account',
// categories:
'new_category' => 'New category',

2
resources/lang/en_US/form.php
View File

@@ -25,6 +25,8 @@ return [
'match' => 'Matches on',
'repeat_freq' => 'Repeats',
'journal_currency_id' => 'Currency',
'currency_id' => 'Currency',
'attachments' => 'Attachments',
'journal_amount' => 'Amount',
'journal_asset_source_account' => 'Asset account (source)',
'journal_source_account_name' => 'Revenue account (source)',

18
resources/views/index.twig
View File

@@ -82,9 +82,21 @@
</div>
<div class="box-body no-padding">
{% include 'list.journals-tiny-tasker' with {'transactions': data[0],'account': data[1]} %}
</div>
{% if data[0].count > 0 %}
<div class="box-body no-padding">
{% include 'list.journals-tiny-tasker' with {'transactions': data[0],'account': data[1]} %}
</div>
{% else %}
<div class="box-body">
<p>
<em>
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
</em>
</p>
</div>
{% endif %}
<div class="box-footer clearfix">
<a class="btn btn-sm btn-default btn-flat pull-right"
href="{{ route('accounts.show',data[1].id) }}">{{ (data[1]|balance)|formatAmountPlain }}</a>