kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Some new bread crumbs [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-05-17 15:12:45 +02:00
parent 2b17396d6b
commit 9946535f01
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/TransactionController.php
View File

@@ -117,10 +117,11 @@ class TransactionController extends Controller
$what = strtolower($journal->transactiontype->type); $what = strtolower($journal->transactiontype->type);
$accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
$budgets = ExpandedForm::makeSelectList(Auth::user()->budgets()->get()); $budgets = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
$budgets[0] = '(no budget)'; $budgets[0] = trans('form.noBudget');
$transactions = $journal->transactions()->orderBy('amount', 'DESC')->get(); $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
$piggies = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->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 = [ $preFilled = [
'date' => $journal->date->format('Y-m-d'), 'date' => $journal->date->format('Y-m-d'),
'category' => '', 'category' => '',
@@ -247,7 +248,7 @@ class TransactionController extends Controller
$t->after = $t->before + $t->amount; $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')); return view('transactions.show', compact('journal', 'subTitle'));
} }

4
app/Http/breadcrumbs.php
View File

@@ -371,7 +371,7 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) { 'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.show', $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( Breadcrumbs::register(
@@ -385,7 +385,7 @@ Breadcrumbs::register(
'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) { 'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type)); $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));
} }
); );

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

@@ -51,8 +51,9 @@ return [
'expenseAccounts' => 'Expense accounts', 'expenseAccounts' => 'Expense accounts',
'revenueAccounts' => 'Revenue accounts', 'revenueAccounts' => 'Revenue accounts',
'Asset account' => 'Asset account', 'Asset account' => 'Asset account',
'Default account' => 'Asset account',
'Expense account' => 'Expense account', 'Expense account' => 'Expense account',
'Revenue Account' => 'Revenue account', 'Revenue account' => 'Revenue account',
'budgets' => 'Budgets', 'budgets' => 'Budgets',
'categories' => 'Categories', 'categories' => 'Categories',
'tags' => 'Tags', 'tags' => 'Tags',

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

@@ -51,8 +51,9 @@ return [
'expenseAccounts' => 'Crediteuren', 'expenseAccounts' => 'Crediteuren',
'revenueAccounts' => 'Debiteuren', 'revenueAccounts' => 'Debiteuren',
'Asset account' => 'Betaalrekening', 'Asset account' => 'Betaalrekening',
'Default account' => 'Betaalrekening',
'Expense account' => 'Crediteur', 'Expense account' => 'Crediteur',
'Revenue Account' => 'Debiteur', 'Revenue account' => 'Debiteur',
'budgets' => 'Budgetten', 'budgets' => 'Budgetten',
'categories' => 'Categorieën', 'categories' => 'Categorieën',
'tags' => 'Tags', 'tags' => 'Tags',