From 9946535f0127e4da929f660ca7c1055d19eed107 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 17 May 2015 15:12:45 +0200
Subject: [PATCH] Some new bread crumbs [skip ci]

---
 app/Http/Controllers/TransactionController.php | 7 ++++---
 app/Http/breadcrumbs.php                       | 4 ++--
 resources/lang/en/firefly.php                  | 3 ++-
 resources/lang/nl/firefly.php                  | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index d7c78c63d3..e8a0c23a81 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -117,10 +117,11 @@ class TransactionController extends Controller
         $what         = strtolower($journal->transactiontype->type);
         $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
-        $budgets[0]   = '(no budget)';
+        $budgets[0]   = trans('form.noBudget');
         $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
         $piggies      = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0]   = '(no piggy bank)';
+        $piggies[0]   = trans('form.noPiggybank');
+        $subTitle     = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
         $preFilled    = [
             'date'          => $journal->date->format('Y-m-d'),
             'category'      => '',
@@ -247,7 +248,7 @@ class TransactionController extends Controller
                 $t->after  = $t->before + $t->amount;
             }
         );
-        $subTitle = e($journal->transactiontype->type) . ' "' . e($journal->description) . '"';
+        $subTitle = trans('firefly.' . $journal->transactiontype->type) . ' "' . e($journal->description) . '"';
 
         return view('transactions.show', compact('journal', 'subTitle'));
     }
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index c08cbc66c5..5f3c45adfb 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -371,7 +371,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => e($journal->description)]), route('transactions.edit', $journal->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', $journal->id));
 }
 );
 Breadcrumbs::register(
@@ -385,7 +385,7 @@ Breadcrumbs::register(
     'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
 
     $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
-    $breadcrumbs->push(e($journal->description), route('transactions.show', $journal->id));
+    $breadcrumbs->push($journal->description, route('transactions.show', $journal->id));
 
 }
 );
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index 10f37a296c..82f2f72b47 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -51,8 +51,9 @@ return [
     'expenseAccounts'            => 'Expense accounts',
     'revenueAccounts'            => 'Revenue accounts',
     'Asset account'              => 'Asset account',
+    'Default account'            => 'Asset account',
     'Expense account'            => 'Expense account',
-    'Revenue Account'            => 'Revenue account',
+    'Revenue account'            => 'Revenue account',
     'budgets'                    => 'Budgets',
     'categories'                 => 'Categories',
     'tags'                       => 'Tags',
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index 2913232cfa..c619867098 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -51,8 +51,9 @@ return [
     'expenseAccounts'            => 'Crediteuren',
     'revenueAccounts'            => 'Debiteuren',
     'Asset account'              => 'Betaalrekening',
+    'Default account'            => 'Betaalrekening',
     'Expense account'            => 'Crediteur',
-    'Revenue Account'            => 'Debiteur',
+    'Revenue account'            => 'Debiteur',
     'budgets'                    => 'Budgetten',
     'categories'                 => 'Categorieën',
     'tags'                       => 'Tags',