IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 20:54:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

New translations [skip ci]

Browse Source
This commit is contained in:
James Cole 2016-04-20 17:10:35 +02:00
parent c56a39a726
commit 6a15afc723
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ return [
'warning_much_data' => ':days days of data may take a while to load.',
'registered' => 'You have registered successfully!',
'search' => 'Search',
'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the <a href="/budgets">budgets</a>-page. Budgets can help you keep track of expenses.',
'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the <a href="/budgets">budgets</a>-page. Budgets can help you keep track of expenses.',
// account confirmation:
'confirm_account_header' => 'Please confirm your account',
@ -462,9 +462,18 @@ return [
'update_budget' => 'Update budget',
// bills:
'matching_on' => 'Matching on',
'between_amounts' => 'between :low and :high.',
'repeats' => 'Repeats',
'connected_journals' => 'Connected transaction journals',
'auto_match_on' => 'Automatically matched by Firefly',
'auto_match_off' => 'Not automatically matched by Firefly',
'next_expected_match' => 'Next expected match',
'delete_bill' => 'Delete bill ":name"',
'deleted_bill' => 'Deleted bill ":name"',
'edit_bill' => 'Edit bill ":name"',
'more' => 'More',
'rescan_old' => 'Rescan old transactions',
'update_bill' => 'Update bill',
'updated_bill' => 'Updated bill ":name"',
'store_new_bill' => 'Store new bill',
@ -508,6 +517,7 @@ return [
'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',
// categories:
'new_category' => 'New category',
@ -642,6 +652,7 @@ return [
'noCategory' => '(no category)',
'notCharged' => 'Not charged (yet)',
'inactive' => 'Inactive',
'active' => 'Active',
'difference' => 'Difference',
'in' => 'In',
'out' => 'Out',
@ -674,6 +685,7 @@ return [
'audit_end_balance' => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
// charts:
'chart' => 'Chart',
'dayOfMonth' => 'Day of the month',
'month' => 'Month',
'budget' => 'Budget',

2
resources/views/accounts/edit.twig
View File

@ -45,7 +45,7 @@
{% if Session.get('preFilled').accountRole == 'ccAsset' %}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Credit card options</h3>
<h3 class="box-title">{{ 'credit_card_options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.select('ccType',Config.get('firefly.ccTypes')) }}

29
resources/views/bills/show.twig
View File

@ -13,15 +13,15 @@
<h3 class="box-title">{{ bill.name }}</h3>
{% if bill.active %}
<i class="fa fa-check fa-fw" title="Active"></i>
<i class="fa fa-check fa-fw" title="{{ 'active'|_ }}"></i>
{% else %}
<i class="fa fa-times fa-fw" title="Inactive"></i>
<i class="fa fa-times fa-fw" title="{{ 'inactive'|_ }}"></i>
{% endif %}
{% if bill.automatch %}
<i class="fa fa-check fa-fw" title="Automatically matched by Firefly"></i>
<i class="fa fa-check fa-fw" title="{{ 'auto_match_on'|_ }}"></i>
{% else %}
<i class="fa fa-times fa-fw" title="Not automatically matched by Firefly"></i>
<i class="fa fa-times fa-fw" title="{{ 'auto_match_off'|_ }}"></i>
{% endif %}
<!-- ACTIONS MENU -->
@ -30,8 +30,8 @@
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.edit',bill.id) }}"><i class="fa fa-fw fa-pencil"></i> edit</a></li>
<li><a href="{{ route('bills.delete',bill.id) }}"><i class="fa fa-fw fa-trash-o"></i> delete</a></li>
<li><a href="{{ route('bills.edit',bill.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('bills.delete',bill.id) }}"><i class="fa fa-fw fa-trash-o"></i> {{ 'delete'|_ }}</a></li>
</ul>
</div>
</div>
@ -41,17 +41,18 @@
<table class="table">
<tr>
<td colspan="2">
Matching on
{{ 'matching_on'|_ }}
{% for word in bill.match|split(',') %}
<span class="label label-info">{{ word }}</span>
{% endfor %}
between {{ bill.amount_min|formatAmount }} and {{ bill.amount_max|formatAmount }}.
Repeats {{ bill.repeat_freq }}.
{{ trans('firefly.between_amounts', {low: bill.amount_min|formatAmount, high: bill.amount_max|formatAmount }) }}
{{ 'repeats'|_ }}
{{ trans('firefly.repeat_freq_' ~bill.repeat_freq) }}.
</td>
</tr>
<tr>
<td>Next expected match</td>
<td>{{ 'next_expected_match'|_ }}</td>
<td>
{% if bill.nextExpectedMatch %}
{{ bill.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
@ -67,11 +68,11 @@
<div class="col-lg-6 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">More</h3>
<h3 class="box-title">{{ 'more'|_ }}</h3>
</div>
<div class="box-body">
<p>
<a href="{{ route('bills.rescan',bill.id) }}" class="btn btn-default">Rescan old transactions</a>
<a href="{{ route('bills.rescan',bill.id) }}" class="btn btn-default">{{ 'rescan_old'|_ }}</a>
</p>
</div>
</div>
@ -82,7 +83,7 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Chart</h3>
<h3 class="box-title">{{ 'chart'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="bill-overview" style="width:100%;" height="400"></canvas>
@ -95,7 +96,7 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Connected transaction journals</h3>
<h3 class="box-title">{{ 'connected_journals' }}</h3>
</div>
<div class="box-body table-responsive no-padding">
{% include 'list/journals' %}