Nieuw vertalingen [skip ci]

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');
     }
 

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');
     }
 

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;
         }

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',

resources/lang/en/list.php

@@ -25,5 +25,7 @@ return [
     'bill'           => 'Bill',
     'withdrawal'     => 'Withdrawal',
     'deposit'        => 'Deposit',
-    'transfer'       => 'Transfer'
+    'transfer'       => 'Transfer',
+    'type'           => 'Type',
+    'completed' => 'Completed',
 ];

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',

resources/lang/nl/list.php

@@ -25,5 +25,8 @@ return [
     'bill'           => 'Rekening',
     'withdrawal'     => 'Uitgave',
     'deposit'        => 'Inkomsten',
-    'transfer'       => 'Overschrijving'
+    'transfer'       => 'Overschrijving',
+    'type'           => 'Type',
+    'completed'      => 'Opgeslagen'
+
 ];

resources/twig/transactions/show.twig

@@ -10,38 +10,38 @@
             </div>
                 <table class="table table-striped table-bordered">
                     <tr>
-                        <td>Date</td>
+                        <td>{{ trans('list.date') }}</td>
-                        <td>{{ journal.date.format('jS F Y') }}</td>
+                        <td>{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
                     </tr>
                     <tr>
-                        <td>Type</td>
+                        <td>{{ trans('list.type') }}</td>
-                        <td>{{ journal.transactiontype.type }}</td>
+                        <td>{{ journal.transactiontype.type|_ }}</td>
                     </tr>
                     <tr>
-                        <td>Completed</td>
+                        <td>{{ trans('list.completed') }}</td>
                         <td>
                             {% if journal.completed %}
-                            <span class="text-success">Yes</span>
+                            <span class="text-success">{{ 'yes'|_ }}</span>
                             {% else %}
-                            <span class="text-danger">No</span>
+                            <span class="text-danger">{{ 'no'|_ }}</span>
                             {% endif %}
                         </td>
                     </tr>
                     {% for budget in journal.budgets %}
                         <tr>
-                            <td>Budget</td>
+                            <td>{{ 'budget'|_ }}</td>
                             <td><a href="{{route('budgets.show',budget.id)}}">{{ budget.name }}</a></td>
                         </tr>
                     {% endfor %}
                     {% for category in journal.categories %}
                         <tr>
-                            <td>Category</td>
+                            <td>{{ 'category'|_ }}</td>
                             <td><a href="{{route('categories.show',category.id)}}">{{ category.name }}</a></td>
                         </tr>
                     {% endfor %}
                     {% if journal.tags|length > 0 %}
                         <tr>
-                            <td>Tags</td>
+                            <td>{{ 'tags'|_ }}</td>
                             <td>
                                 {% for tag in journal.tags %}
 
@@ -67,7 +67,7 @@
         {% if journal.piggyBankEvents|length > 0 %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    Piggy banks
+                    {{ 'piggyBanks'|_ }}
                 </div>
                 <div class="panel-body">
                     {% include 'list/piggy-bank-events' with {'events': journal.piggyBankEvents, 'showPiggyBank':true} %}
@@ -96,15 +96,15 @@
                 {% if t.account.accounttype.type == 'Revenue account' %}
                     <i class="fa fa-download fa-fw"></i>
                 {% endif %}
-                <a href="{{route('accounts.show',t.account.id)}}">{{ t.account.name }}</a><br /><small>{{ t.account.accounttype.description }}</small>
+                <a href="{{route('accounts.show',t.account.id)}}">{{ t.account.name }}</a> <small>({{ t.account.accounttype.type|_ }})</small>
             </div>
                 <table class="table table-striped table-bordered">
                     <tr>
-                        <td>Amount</td>
+                        <td>{{ 'amount'|_ }}</td>
                         <td>{{ t|formatTransaction }}</td>
                     </tr>
                     <tr>
-                        <td>New balance</td>
+                        <td>{{ 'newBalance'|_ }}</td>
                         <td>{{ t.before|formatAmount }} &rarr; {{ t.after|formatAmount }}</td>
                     </tr>
                     {% if t.description %}