kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup and translations.

Browse Source
This commit is contained in:
James Cole
2015-12-12 12:29:54 +01:00
parent 6426d1df06
commit 152d0eb1d0
3 changed files with 219 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/lang/en/firefly.php
View File

@@ -250,35 +250,27 @@ return [
'details_for_expense' => 'Details for expense account ":name"',
'details_for_revenue' => 'Details for revenue account ":name"',
'details_for_cash' => 'Details for cash account ":name"',
'store_new_asset_account' => 'Store new asset account',
'store_new_expense_account' => 'Store new expense account',
'store_new_revenue_account' => 'Store new revenue account',
'edit_asset_account' => 'Edit asset account ":name"',
'edit_expense_account' => 'Edit expense account ":name"',
'edit_revenue_account' => 'Edit revenue account ":name"',
'delete_asset_account' => 'Delete asset account ":name"',
'delete_expense_account' => 'Delete expense account ":name"',
'delete_revenue_account' => 'Delete revenue account ":name"',
'asset_deleted' => 'Successfully deleted asset account ":name"',
'expense_deleted' => 'Successfully deleted expense account ":name"',
'revenue_deleted' => 'Successfully deleted revenue account ":name"',
'update_asset_account' => 'Update asset account',
'update_expense_account' => 'Update expense account',
'update_revenue_account' => 'Update revenue account',
'make_new_asset_account' => 'Create a new asset account',
'make_new_expense_account' => 'Create a new expense account',
'make_new_revenue_account' => 'Create a new revenue account',
'asset_accounts' => 'Asset accounts',
'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts',
'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => '',
'accountExtraHelp_revenue' => '',
@@ -411,6 +403,13 @@ return [
'average_of_year' => 'Average of year',
'categories_earned_in_year' => 'Categories (by earnings)',
'categories_spent_in_year' => 'Categories (by spendings)',
'report_type' => 'Report type',
'report_type_default' => 'Default financial report',
'report_included_accounts' => 'Included accounts',
'report_date_range' => 'Date range',
'report_include_help' => 'In all cases, transfers to shared accounts count as expenses, and transfers from shared accounts count as income.',
'report_preset_ranges' => 'Pre-set ranges',
'shared' => 'Shared',
// charts:
'dayOfMonth' => 'Day of the month',

8
resources/lang/nl/firefly.php
View File

@@ -422,6 +422,14 @@ return [
'hideTheRest' => 'Laat alleen de top :number zien',
'categories_earned_in_year' => 'Categorieën (inkomsten)',
'categories_spent_in_year' => 'Categorieën (uitgaven)',
'report_type' => 'Rapporttype',
'report_type_default' => 'Standard financieel rapport',
'report_included_accounts' => 'Accounts in rapport',
'report_date_range' => 'Datumbereik',
'report_include_help' => 'Overboekingen naar gedeelde rekeningen tellen als uitgave. Overboekingen van gedeelde rekeningen tellen als inkomsten.',
'report_preset_ranges' => 'Standaardbereik',
'shared' => 'Gedeeld',
// charts:
'dayOfMonth' => 'Dag vd maand',

61
resources/twig/reports/index.twig
View File

@@ -5,69 +5,27 @@
{% endblock %}
{% block content %}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'reportsOwnAccounts'|_ }}</h3>
</div>
<div class="box-body">
{% for year, data in months %}
<h4><a href="{{ route('reports.year',year) }}">{{ year }}</a></h4>
<ul class="list-inline">
{% for month in data.months %}
<li>
<a href="{{ route('reports.month',[month.year, month.month]) }}">{{ month.formatted }}</a>
</li>
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'reportsOwnAccountsAndShared'|_ }}</h3>
</div>
<div class="box-body">
{% for year, data in months %}
<h4><a href="{{ route('reports.year',[year, 'shared']) }}">{{ year }}</a></h4>
<ul class="list-inline">
{% for month in data.months %}
<li>
<a href="{{ route('reports.month',[month.year, month.month,'shared']) }}">{{ month.formatted }}</a>
</li>
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Some new reports.</h3>
<h3 class="box-title">{{ 'reports'|_ }}</h3>
</div>
<div class="box-body">
<form class="form-horizontal" id="report-form" action="{{ route('reports.select') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="form-group">
<label for="inputReportType" class="col-sm-3 control-label">Report type</label>
<label for="inputReportType" class="col-sm-3 control-label">{{ 'report_type'|_ }}</label>
<div class="col-sm-9">
<select name="report_type" class="form-control" id="inputReportType">
<option label="Default financial report" value="default">Default financial report</option>
<option label="{{ 'report_type_default'|_ }}" value="default">{{ 'report_type_default'|_ }}</option>
</select>
</div>
</div>
<div class="form-group">
<label for="inputAccounts" class="col-sm-3 control-label">Included accounts</label>
<label for="inputAccounts" class="col-sm-3 control-label">{{ 'report_included_accounts'|_ }}</label>
<div class="col-sm-9">
{% for account in accounts %}
@@ -76,22 +34,21 @@
<input type="checkbox" class="account-checkbox" name="accounts[]" value="{{ account.id }}">
{{ account.name }}
{% if account.getMeta('accountRole') == 'sharedAsset' %}
(shared)
({{ 'shared'|_|lower }})
{% endif %}
</label>
</div>
{% endfor %}
<p class="help-block">
In all cases, transfers to shared accounts count as expenses, and transfers
from shared accounts count as income.
{{ 'report_include_help'|_ }}
</p>
</div>
</div>
<div class="form-group">
<label for="inputDateRange" class="col-sm-3 control-label">Report date range</label>
<label for="inputDateRange" class="col-sm-3 control-label">{{ 'report_date_range'|_ }}</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="inputDateRange" name="daterange"
@@ -99,7 +56,7 @@
</div>
</div>
<div class="form-group">
<label for="__none__" class="col-sm-3 control-label">Pre-set ranges</label>
<label for="__none__" class="col-sm-3 control-label">{{ 'report_preset_ranges'|_ }}</label>
<div class="col-sm-9">
{% for year, data in months %}
@@ -117,7 +74,7 @@
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-default">Submit</button>
<button type="submit" class="btn btn-default">{{ 'submit'|_ }}</button>
</div>
</div>
</form>