kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Rename some fields in account overviews.

Browse Source
This commit is contained in:
James Cole
2019-06-21 19:10:24 +02:00
parent c72cc2482a
commit 74a3d155b0
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,15 +63,15 @@ return [
'currency' => 'Currency', 'currency' => 'Currency',
'account_id' => 'Asset account', 'account_id' => 'Asset account',
'budget_id' => 'Budget', 'budget_id' => 'Budget',
'opening_balance' => 'Opening balance', 'opening_balance' => 'Opening balance',
'tagMode' => 'Tag mode', 'tagMode' => 'Tag mode',
'tag_position' => 'Tag location', 'tag_position' => 'Tag location',
'virtualBalance' => 'Virtual balance', 'virtual_balance' => 'Virtual balance',
'targetamount' => 'Target amount', 'targetamount' => 'Target amount',
'accountRole' => 'Account role', 'account_role' => 'Account role',
'opening_balance_date' => 'Opening balance date', 'opening_balance_date' => 'Opening balance date',
'ccType' => 'Credit card payment plan', 'cc_type' => 'Credit card payment plan',
'ccMonthlyPaymentDate' => 'Credit card monthly payment date', 'cc_monthly_payment_date' => 'Credit card monthly payment date',
'piggy_bank_id' => 'Piggy bank', 'piggy_bank_id' => 'Piggy bank',
'returnHere' => 'Return here', 'returnHere' => 'Return here',
'returnHereExplanation' => 'After storing, return here to create another one.', 'returnHereExplanation' => 'After storing, return here to create another one.',
@@ -119,7 +119,7 @@ return [
'symbol' => 'Symbol', 'symbol' => 'Symbol',
'code' => 'Code', 'code' => 'Code',
'iban' => 'IBAN', 'iban' => 'IBAN',
'accountNumber' => 'Account number', 'account_number' => 'Account number',
'creditCardNumber' => 'Credit card number', 'creditCardNumber' => 'Credit card number',
'has_headers' => 'Headers', 'has_headers' => 'Headers',
'date_format' => 'Date format', 'date_format' => 'Date format',

6
resources/views/v1/accounts/create.twig
View File

@@ -41,14 +41,14 @@
{{ ExpandedForm.text('iban') }} {{ ExpandedForm.text('iban') }}
{{ ExpandedForm.text('BIC', null, {maxlength: 11}) }} {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }}
{{ ExpandedForm.text('accountNumber') }} {{ ExpandedForm.text('account_number') }}
{% if what == 'asset' %} {% if what == 'asset' %}
{{ ExpandedForm.amountNoCurrency('opening_balance') }} {{ ExpandedForm.amountNoCurrency('opening_balance') }}
{{ ExpandedForm.date('opening_balance_date') }} {{ ExpandedForm.date('opening_balance_date') }}
{{ ExpandedForm.select('accountRole', roles,null,{helpText : 'asset_account_role_help'|_}) }} {{ ExpandedForm.select('account_role', roles,null,{helpText : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.amountNoCurrency('virtualBalance') }} {{ ExpandedForm.amountNoCurrency('virtual_balance') }}
{% endif %} {% endif %}
{# only correct way to do active checkbox #} {# only correct way to do active checkbox #}
{{ ExpandedForm.checkbox('include_net_worth', 1) }} {{ ExpandedForm.checkbox('include_net_worth', 1) }}

6
resources/views/v1/list/accounts.twig
View File

@@ -13,7 +13,7 @@
<th data-defaultsign="az">{{ trans('list.liability_type') }}</th> <th data-defaultsign="az">{{ trans('list.liability_type') }}</th>
<th data-defaultsign="_19">{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th> <th data-defaultsign="_19">{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th>
{% endif %} {% endif %}
<th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('form.accountNumber') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('form.account_number') }}</th>
<th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th> <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th> <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
{# hide last activity to make room for other stuff #} {# hide last activity to make room for other stuff #}
@@ -41,7 +41,7 @@
{% if what == "asset" %} {% if what == "asset" %}
<td class="hidden-sm hidden-xs hidden-md"> <td class="hidden-sm hidden-xs hidden-md">
{% for entry in account.accountmeta %} {% for entry in account.accountmeta %}
{% if entry.name == 'accountRole' %} {% if entry.name == 'account_role' %}
{{ ('account_role_'~entry.data)|_ }} {{ ('account_role_'~entry.data)|_ }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@@ -53,7 +53,7 @@
{{ account.interest }}% ({{ account.interestPeriod|lower }}) {{ account.interest }}% ({{ account.interestPeriod|lower }})
</td> </td>
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'accountNumber') }}{% endif %}</td> <td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'account_number') }}{% endif %}</td>
<td data-value="{{ account.endBalance }}" style="text-align: right;"> <td data-value="{{ account.endBalance }}" style="text-align: right;">
<span style="margin-right:5px;"> <span style="margin-right:5px;">
{{ formatAmountByAccount(account, account.endBalance) }} {{ formatAmountByAccount(account, account.endBalance) }}