diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 8ffa215491..aa128c8223 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -31,7 +31,7 @@ class PiggyBankController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Piggy banks'); + View::share('title', trans('firefly.piggyBanks')); View::share('mainTitleIcon', 'fa-sort-amount-asc'); } diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 661a5cd3c9..ab2425ebde 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -22,7 +22,7 @@ class PreferencesController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Preferences'); + View::share('title', trans('firefly.preferences')); View::share('mainTitleIcon', 'fa-gear'); } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 5ee2a7a690..d0f8206bb8 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -30,7 +30,7 @@ class TransactionController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Transactions'); + View::share('title', trans('firefly.transactions')); View::share('mainTitleIcon', 'fa-repeat'); } @@ -182,19 +182,19 @@ class TransactionController extends Controller case 'expenses': case 'withdrawal': $subTitleIcon = 'fa-long-arrow-left'; - $subTitle = 'Expenses'; + $subTitle = trans('firefly.expenses'); $types = ['Withdrawal']; break; case 'revenue': case 'deposit': $subTitleIcon = 'fa-long-arrow-right'; - $subTitle = 'Revenue, income and deposits'; + $subTitle = trans('firefly.income'); $types = ['Deposit']; break; case 'transfer': case 'transfers': $subTitleIcon = 'fa-exchange'; - $subTitle = 'Transfers'; + $subTitle = trans('firefly.transfers'); $types = ['Transfer']; break; } diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index f142d23a8f..58e91b1da5 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -50,6 +50,9 @@ return [ 'assetAccounts' => 'Asset accounts', 'expenseAccounts' => 'Expense accounts', 'revenueAccounts' => 'Revenue accounts', + 'Asset account' => 'Asset account', + 'Expense account' => 'Expense account', + 'Revenue Account' => 'Revenue account', 'budgets' => 'Budgets', 'categories' => 'Categories', 'tags' => 'Tags', @@ -65,7 +68,14 @@ return [ 'withdrawal' => 'Withdrawal', 'deposit' => 'Deposit', 'transfer' => 'Transfer', + 'Withdrawal' => 'Withdrawal', + 'Deposit' => 'Deposit', + 'Transfer' => 'Transfer', 'bill' => 'Rekening', + 'yes' => 'Yes', + 'no' => 'No', + 'amount' => 'Amount', + 'newBalance' => 'New balance', // charts: 'dayOfMonth' => 'Day of the month', diff --git a/resources/lang/en/list.php b/resources/lang/en/list.php index 4a85e56f93..206ec2068d 100644 --- a/resources/lang/en/list.php +++ b/resources/lang/en/list.php @@ -25,5 +25,7 @@ return [ 'bill' => 'Bill', 'withdrawal' => 'Withdrawal', 'deposit' => 'Deposit', - 'transfer' => 'Transfer' + 'transfer' => 'Transfer', + 'type' => 'Type', + 'completed' => 'Completed', ]; \ No newline at end of file diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 2569701198..61b0913475 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -50,6 +50,9 @@ return [ 'assetAccounts' => 'Betaalrekeningen', 'expenseAccounts' => 'Crediteuren', 'revenueAccounts' => 'Debiteuren', + 'Asset account' => 'Betaalrekening', + 'Expense account' => 'Crediteur', + 'Revenue Account' => 'Debiteur', 'budgets' => 'Budgetten', 'categories' => 'Categorieën', 'tags' => 'Tags', @@ -65,7 +68,14 @@ return [ 'withdrawal' => 'Uitgave', 'deposit' => 'Inkomsten', 'transfer' => 'Overschrijving', + 'Withdrawal' => 'Uitgave', + 'Deposit' => 'Inkomsten', + 'Transfer' => 'Overschrijving', 'bill' => 'Rekening', + 'yes' => 'Ja', + 'no' => 'Nee', + 'amount' => 'Bedrag', + 'newBalance' => 'Nieuw saldo', // charts: 'dayOfMonth' => 'Dag vd maand', diff --git a/resources/lang/nl/list.php b/resources/lang/nl/list.php index 6d28f20d09..de463fcc58 100644 --- a/resources/lang/nl/list.php +++ b/resources/lang/nl/list.php @@ -25,5 +25,8 @@ return [ 'bill' => 'Rekening', 'withdrawal' => 'Uitgave', 'deposit' => 'Inkomsten', - 'transfer' => 'Overschrijving' + 'transfer' => 'Overschrijving', + 'type' => 'Type', + 'completed' => 'Opgeslagen' + ]; \ No newline at end of file diff --git a/resources/twig/transactions/show.twig b/resources/twig/transactions/show.twig index afd6725b0f..06cf4cab6a 100644 --- a/resources/twig/transactions/show.twig +++ b/resources/twig/transactions/show.twig @@ -10,38 +10,38 @@ - - + + - - + + - + {% for budget in journal.budgets %} - + {% endfor %} {% for category in journal.categories %} - + {% endfor %} {% if journal.tags|length > 0 %} - +
Date{{ journal.date.format('jS F Y') }}{{ trans('list.date') }}{{ journal.date.formatLocalized(monthAndDayFormat) }}
Type{{ journal.transactiontype.type }}{{ trans('list.type') }}{{ journal.transactiontype.type|_ }}
Completed{{ trans('list.completed') }} {% if journal.completed %} - Yes + {{ 'yes'|_ }} {% else %} - No + {{ 'no'|_ }} {% endif %}
Budget{{ 'budget'|_ }} {{ budget.name }}
Category{{ 'category'|_ }} {{ category.name }}
Tags{{ 'tags'|_ }} {% for tag in journal.tags %} @@ -67,7 +67,7 @@ {% if journal.piggyBankEvents|length > 0 %}
- Piggy banks + {{ 'piggyBanks'|_ }}
{% include 'list/piggy-bank-events' with {'events': journal.piggyBankEvents, 'showPiggyBank':true} %} @@ -96,15 +96,15 @@ {% if t.account.accounttype.type == 'Revenue account' %} {% endif %} - {{ t.account.name }}
{{ t.account.accounttype.description }} + {{ t.account.name }} ({{ t.account.accounttype.type|_ }})
- + - + {% if t.description %}
Amount{{ 'amount'|_ }} {{ t|formatTransaction }}
New balance{{ 'newBalance'|_ }} {{ t.before|formatAmount }} → {{ t.after|formatAmount }}