diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index e7573965ad..fee773abb4 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -61,7 +61,7 @@ class BillController extends Controller
Session::put('bills.delete.url', URL::previous());
Session::flash('gaEventCategory', 'bills');
Session::flash('gaEventAction', 'delete');
- $subTitle = 'Delete "' . e($bill->name) . '"';
+ $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]);
return view('bills.delete', compact('bill', 'subTitle'));
}
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 82e6cc3208..70d39f6040 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -78,7 +78,7 @@ class BudgetController extends Controller
*/
public function delete(Budget $budget)
{
- $subTitle = 'Delete budget' . e($budget->name) . '"';
+ $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]);
// put previous url in session
Session::put('budgets.delete.url', URL::previous());
@@ -217,9 +217,10 @@ class BudgetController extends Controller
$journals = $repository->getJournals($budget, $repetition);
$limits = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
- $subTitle = !is_null($repetition->id) ?
+ $subTitle = !is_null($repetition->id)
+ ?
trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)])
- :
+ :
e($budget->name);
$journals->setPath('/budgets/show/' . $budget->id);
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index ba55ae289e..733a714beb 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -54,7 +54,7 @@ class CategoryController extends Controller
*/
public function delete(Category $category)
{
- $subTitle = 'Delete category "' . e($category->name) . '"';
+ $subTitle = trans('firefly.delete_category', ['name' => $category->name]);
// put previous url in session
Session::put('categories.delete.url', URL::previous());
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 943293a26b..44f87a3463 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -85,7 +85,7 @@ class PiggyBankController extends Controller
*/
public function delete(PiggyBank $piggyBank)
{
- $subTitle = 'Delete "' . e($piggyBank->name) . '"';
+ $subTitle = trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]);
// put previous url in session
Session::put('piggy-banks.delete.url', URL::previous());
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 5b572dd869..28d47123aa 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -83,7 +83,7 @@ class TagController extends Controller
*/
public function delete(Tag $tag)
{
- $subTitle = 'Delete "' . e($tag->tag) . '"';
+ $subTitle = trans('firefly.delete_tag', ['name' => $tag->tag]);
// put previous url in session
Session::put('tags.delete.url', URL::previous());
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 4c88f3106b..e4044ba777 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -81,7 +81,7 @@ class TransactionController extends Controller
public function delete(TransactionJournal $journal)
{
$type = strtolower($journal->transactionType->type);
- $subTitle = 'Delete ' . e($type) . ' "' . e($journal->description) . '"';
+ $subTitle = trans('firefly.delete_' . $type, ['description' => $journal->description]);
// put previous url in session
Session::put('transactions.delete.url', URL::previous());
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index 3b441fa7a3..adc4d7176c 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -33,6 +33,10 @@ return [
'inactiveBudgets' => 'Inactive budgets',
'without_budget_between' => 'Transactions without a budget between :start and :end',
'budget_in_month' => ':name in :month',
+ 'delete_budget' => 'Delete budget ":name"',
+
+ // bills:
+ 'delete_bill' => 'Delete bill ":name"',
// accounts:
'details_for_asset' => 'Details for asset account ":name"',
@@ -79,11 +83,15 @@ return [
'categories' => 'Categories',
'no_category' => '(no category)',
'category' => 'Category',
+ 'delete_category' => 'Delete category ":name"',
// transactions:
'update_withdrawal' => 'Update withdrawal',
'update_deposit' => 'Update deposit',
'update_transfer' => 'Update transfer',
+ 'delete_withdrawal' => 'Delete withdrawal ":description"',
+ 'delete_deposit' => 'Delete deposit ":description"',
+ 'delete_transfer' => 'Delete transfer ":description"',
// new user:
'welcome' => 'Welcome to Firefly!',
@@ -245,6 +253,10 @@ return [
'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
+ 'delete_piggy_bank' => 'Delete piggy bank ":name"',
+
+ // tags
+ 'delete_tag' => 'Delete tag ":name"',
];
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index ed532b2cad..5035174ae5 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -33,6 +33,10 @@ return [
'inactiveBudgets' => 'Inactieve budgetten',
'without_budget_between' => 'Transacties zonder budget tussen :start en :end',
'budget_in_month' => ':name in :month',
+ 'delete_budget' => 'Verwijder budget ":name"',
+
+ // bills:
+ 'delete_bill' => 'Verwijder rekening ":name"',
// accounts:
'details_for_asset' => 'Overzicht voor betaalrekening ":name"',
@@ -88,11 +92,15 @@ return [
'categories' => 'Categorieën',
'no_category' => '(geen categorie)',
'category' => 'Categorie',
+ 'delete_category' => 'Verwijder categorie ":name"',
// transactions:
'update_withdrawal' => 'Wijzig uitgave',
'update_deposit' => 'Wijzig inkomsten',
'update_transfer' => 'Wijzig overschrijving',
+ 'delete_withdrawal' => 'Verwijder uitgave ":description"',
+ 'delete_deposit' => 'Verwijder inkomsten ":description"',
+ 'delete_transfer' => 'Verwijder overschrijving ":description"',
// new user:
'welcome' => 'Welkom bij Firefly!',
@@ -253,6 +261,9 @@ return [
'table' => 'Tabel',
'add_any_amount_to_piggy' => 'Stop geld in dit spaarpotje om het doel van :amount te halen.',
'add_set_amount_to_piggy' => 'Stop voor :date :amount in dit spaarpotje om hem op tijd te vullen.',
+ 'delete_piggy_bank' => 'Verwijder spaarpotje ":name"',
+ // tags
+ 'delete_tag' => 'Verwijder tag ":name"',
];
diff --git a/resources/twig/list/piggy-banks.twig b/resources/twig/list/piggy-banks.twig
index b247b253de..8f1212356d 100644
--- a/resources/twig/list/piggy-banks.twig
+++ b/resources/twig/list/piggy-banks.twig
@@ -9,7 +9,7 @@
|
|
|