diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 2c06b6b475..bf0baa0805 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -44,9 +44,9 @@ class TagController extends Controller View::share('mainTitleIcon', 'fa-tags'); View::share('hideTags', true); $this->tagOptions = [ - 'nothing' => 'Just a regular tag.', - 'balancingAct' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.', - 'advancePayment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.', + 'nothing' => trans('firefly.regular_tag'), + 'balancingAct' => trans('firefly.balancing_act'), + 'advancePayment' => trans('firefly.advance_payment'), ]; View::share('tagOptions', $this->tagOptions); } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index aab4f281b1..6e7d3c6537 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -42,7 +42,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.create', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); + $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); } ); @@ -129,7 +129,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'categories.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create')); + $breadcrumbs->push(trans('firefly.new_category'), route('categories.create')); } ); @@ -231,7 +231,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'piggy-banks.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index')); + $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index')); } ); Breadcrumbs::register( @@ -250,7 +250,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id])); + $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id])); } ); diff --git a/resources/lang/en/breadcrumbs.php b/resources/lang/en/breadcrumbs.php index 480c8120f0..95f8e0ddce 100644 --- a/resources/lang/en/breadcrumbs.php +++ b/resources/lang/en/breadcrumbs.php @@ -4,23 +4,15 @@ return [ // accounts 'cash_accounts' => 'Cash accounts', - 'new_asset_account' => 'New asset accounts', - 'new_expense_account' => 'New expense account', - 'new_revenue_account' => 'New revenue account', 'edit_account' => 'Edit account ":name"', - // categories - 'newCategory' => 'Create a new category', - // currencies 'edit_currency' => 'Edit currencies ":name"', 'delete_currency' => 'Delete currencies ":name"', // piggy banks - 'piggyBanks' => 'Piggy banks', 'newPiggyBank' => 'Create a new piggy bank', 'edit_piggyBank' => 'Edit piggy bank ":name"', - 'delete_piggyBank' => 'Delete piggy bank ":name"', // top menu 'preferences' => 'Preferences', diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index fa38120cbc..de4886df8e 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -26,14 +26,21 @@ return [ 'added_amount' => 'Added :amount', 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.', 'Opening balance' => 'Opening balance', + 'create_new_stuff' => 'Create new stuff', + 'new_withdrawal' => 'New withdrawal', + 'new_deposit' => 'New deposit', + 'new_transfer' => 'New transfer', + 'new_asset_account' => 'New asset account', + 'new_expense_account' => 'New expense account', + 'new_revenue_account' => 'New revenue account', + 'new_budget' => 'New budget', + 'new_bill' => 'New bill', // tags 'store_new_tag' => 'Store new tag', 'update_tag' => 'Update tag', 'no_location_set' => 'No location set.', 'meta_data' => 'Meta data', - 'edit_tag' => 'Edit tag', - 'delete_tag' => 'Delete tag', 'location' => 'Location', // preferences @@ -459,7 +466,11 @@ return [ 'delete_piggy_bank' => 'Delete piggy bank ":name"', // tags - 'delete_tag' => 'Delete tag ":name"', + 'regular_tag' => 'Just a regular tag.', + 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.', + 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.', + + 'delete_tag' => 'Delete tag ":tag"', 'new_tag' => 'Make new tag', 'edit_tag' => 'Edit tag ":tag"', 'no_year' => 'No year set', diff --git a/resources/lang/en/form.php b/resources/lang/en/form.php index 37a0df20a1..52863ec801 100644 --- a/resources/lang/en/form.php +++ b/resources/lang/en/form.php @@ -73,7 +73,6 @@ return [ 'delete_budget' => 'Delete budget ":name"', 'delete_category' => 'Delete category ":name"', 'delete_currency' => 'Delete currency ":name"', - 'delete_piggyBank' => 'Delete piggy bank ":name"', 'delete_journal' => 'Delete transaction with description ":description"', 'delete_attachment' => 'Delete attachment ":name"', diff --git a/resources/lang/nl/breadcrumbs.php b/resources/lang/nl/breadcrumbs.php index 7c8779e556..52e1b97a96 100644 --- a/resources/lang/nl/breadcrumbs.php +++ b/resources/lang/nl/breadcrumbs.php @@ -4,23 +4,15 @@ return [ // accounts 'cash_accounts' => 'Contant geldrekeningen', - 'new_asset_account' => 'Nieuwe betaalrekening', - 'new_expense_account' => 'Nieuwe crediteur', - 'new_revenue_account' => 'Nieuwe debiteur', 'edit_account' => 'Wijzig rekening ":name"', - // categories - 'newCategory' => 'Maak een nieuw categorie', - // currencies 'edit_currency' => 'Wijzig valuta ":name"', 'delete_currency' => 'Verwijder valuta ":name"', // piggy banks - 'piggyBanks' => 'Spaarpotjes', 'newPiggyBank' => 'Nieuw spaarpotje', 'edit_piggyBank' => 'Wijzig spaarpotje ":name"', - 'delete_piggyBank' => 'Verwijder spaarportje ":name"', // top menu 'preferences' => 'Voorkeuren', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index aec6d31287..a75df006e9 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -26,6 +26,15 @@ return [ 'added_amount' => ':amount toegevoegd', 'asset_account_role_help' => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.', 'Opening balance' => 'Startsaldo', + 'create_new_stuff' => 'Nieuw', + 'new_withdrawal' => 'Nieuwe uitgave', + 'new_deposit' => 'Nieuwe inkomsten', + 'new_transfer' => 'Nieuwe overschrijving', + 'new_asset_account' => 'Nieuwe betaalrekening', + 'new_expense_account' => 'Nieuwe crediteur', + 'new_revenue_account' => 'Nieuwe debiteur', + 'new_budget' => 'Nieuw budget', + 'new_bill' => 'Nieuwe rekening', // tags 'store_new_tag' => 'Sla tag op', @@ -468,7 +477,10 @@ return [ 'delete_piggy_bank' => 'Verwijder spaarpotje ":name"', // tags - 'delete_tag' => 'Verwijder tag ":name"', + 'regular_tag' => 'Een gewone tag.', + 'balancing_act' => 'Er kunnen maar twee transacties worden getagged; een uitgaven en inkomsten. Ze balanceren elkaar.', + 'advance_payment' => 'Je kan een uitgave taggen en zoveel inkomsten om de uitgave (helemaal) te compenseren.', + 'delete_tag' => 'Verwijder tag ":tag"', 'new_tag' => 'Maak nieuwe tag', 'edit_tag' => 'Wijzig tag ":tag"', 'no_year' => 'Zonder jaar', diff --git a/resources/lang/nl/form.php b/resources/lang/nl/form.php index 8d2e544b5c..7899e26a46 100644 --- a/resources/lang/nl/form.php +++ b/resources/lang/nl/form.php @@ -74,7 +74,6 @@ return [ 'delete_budget' => 'Verwijder budget ":name"', 'delete_category' => 'Verwijder categorie ":name"', 'delete_currency' => 'Verwijder valuta ":name"', - 'delete_piggyBank' => 'Verwijder spaarpotje ":name"', 'delete_journal' => 'Verwijder transactie met omschrijving ":description"', 'delete_attachment' => 'Verwijder bijlage ":name"', diff --git a/resources/twig/partials/control-bar.twig b/resources/twig/partials/control-bar.twig index c48a44f8b2..6768a8c17a 100644 --- a/resources/twig/partials/control-bar.twig +++ b/resources/twig/partials/control-bar.twig @@ -4,14 +4,14 @@
-

Create new stuff

+

{{ 'create_new_stuff'|_ }}