diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 045b242b97..5439dcb676 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -35,7 +35,9 @@ class BillController extends Controller */ public function create() { - $periods = Config::get('firefly.periods_to_text'); + $periods = Config::get('firefly.periods_to_text'); + $subTitle = trans('firefly.create_new_bill'); + // put previous url in session if not redirect from store (not "create another"). if (Session::get('bills.create.fromStore') !== true) { @@ -44,7 +46,6 @@ class BillController extends Controller Session::forget('bills.create.fromStore'); Session::flash('gaEventCategory', 'bills'); Session::flash('gaEventAction', 'create'); - $subTitle = 'Create new bill'; return view('bills.create', compact('periods', 'subTitle')); } @@ -90,7 +91,7 @@ class BillController extends Controller public function edit(Bill $bill) { $periods = Config::get('firefly.periods_to_text'); - $subTitle = 'Edit "' . e($bill->name) . '"'; + $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]); // put previous url in session if not redirect from store (not "return_to_edit"). if (Session::get('bills.edit.fromUpdate') !== true) { diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index a58248e9fc..f115ee0526 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -116,7 +116,7 @@ class BudgetController extends Controller */ public function edit(Budget $budget) { - $subTitle = 'Edit budget "' . e($budget->name) . '"'; + $subTitle = trans('firefly.edit_budget',['name' => $budget->name]); // put previous url in session if not redirect from store (not "return_to_edit"). if (Session::get('budgets.edit.fromUpdate') !== true) { diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index b6f016f272..0a6bc918b0 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -43,7 +43,7 @@ class CategoryController extends Controller Session::forget('categories.create.fromStore'); Session::flash('gaEventCategory', 'categories'); Session::flash('gaEventAction', 'create'); - $subTitle = 'Create a new category'; + $subTitle = trans('firefly.create_new_category'); return view('categories.create', compact('subTitle')); } @@ -90,7 +90,7 @@ class CategoryController extends Controller */ public function edit(Category $category) { - $subTitle = 'Edit category "' . e($category->name) . '"'; + $subTitle = trans('firefly.edit_category', ['name' => $category->name]); // put previous url in session if not redirect from store (not "return_to_edit"). if (Session::get('categories.edit.fromUpdate') !== true) { @@ -132,7 +132,10 @@ class CategoryController extends Controller $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->startOfMonth()); $list = $repository->getWithoutCategory($start, $end); - $subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y'); + $subTitle = trans( + 'firefly.without_category_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); return view('categories.noCategory', compact('list', 'subTitle')); } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 8f34c5422d..0ac8a4e580 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -37,7 +37,7 @@ class CurrencyController extends Controller public function create() { $subTitleIcon = 'fa-plus'; - $subTitle = 'Create a new currency'; + $subTitle = trans('firefly.create_currency'); // put previous url in session if not redirect from store (not "create another"). if (Session::get('currency.create.fromStore') !== true) { @@ -124,7 +124,7 @@ class CurrencyController extends Controller public function edit(TransactionCurrency $currency) { $subTitleIcon = 'fa-pencil'; - $subTitle = 'Edit currency "' . e($currency->name) . '"'; + $subTitle = trans('firefly.edit_currency', ['name' => $currency->name]); $currency->symbol = htmlentities($currency->symbol); // put previous url in session if not redirect from store (not "return_to_edit"). diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 381f1c544c..585b092635 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -67,7 +67,7 @@ class PiggyBankController extends Controller $periods = Config::get('firefly.piggy_bank_periods'); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); - $subTitle = 'Create new piggy bank'; + $subTitle = trans('firefly.create_new_piggybank'); $subTitleIcon = 'fa-plus'; // put previous url in session if not redirect from store (not "create another"). diff --git a/app/Http/Controllers/ReminderController.php b/app/Http/Controllers/ReminderController.php index 6e72f32ff6..67479f76f5 100644 --- a/app/Http/Controllers/ReminderController.php +++ b/app/Http/Controllers/ReminderController.php @@ -76,15 +76,13 @@ class ReminderController extends Controller */ public function show(Reminder $reminder) { - $title = 'Reminder'; + $title = trans('firefly.reminder'); $mainTitleIcon = 'fa-clock-o'; if ($reminder->notnow === true) { - $subTitle = 'Dismissed reminder'; + $subTitle = trans('firefly.dismissed_reminder_for_piggy', ['name' => $reminder->remindersable->name]); } else { - $subTitle = 'Reminder'; + $subTitle = trans('firefly.reminder_for_piggy', ['name' => $reminder->remindersable->name]); } - $subTitle .= ' for piggy bank "' . $reminder->remindersable->name . '"'; - return view('reminders.show', compact('reminder', 'title', 'subTitle', 'mainTitleIcon')); diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 09b8527c37..ad3eb16b62 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -26,7 +26,7 @@ class SearchController extends Controller if (!is_null(Input::get('q')) && strlen(Input::get('q')) > 0) { $rawQuery = trim(Input::get('q')); $words = explode(' ', $rawQuery); - $subTitle = 'Results for "' . e($rawQuery) . '"'; + $subTitle = trans('firefly.search_results_for', ['query' => $rawQuery]); $transactions = $searcher->searchTransactions($words); $accounts = $searcher->searchAccounts($words); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 6b000256b7..673b2813d7 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -56,7 +56,7 @@ class TagController extends Controller */ public function create() { - $subTitle = 'New tag'; + $subTitle = trans('firefly.new_tag'); $subTitleIcon = 'fa-tag'; $preFilled = [ @@ -120,7 +120,7 @@ class TagController extends Controller */ public function edit(Tag $tag, TagRepositoryInterface $repository) { - $subTitle = 'Edit tag "' . e($tag->tag) . '"'; + $subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]); $subTitleIcon = 'fa-tag'; /* diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index be59ead881..8c2324ae4b 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -17,6 +17,7 @@ return [ 'to' => 'To', 'showEverything' => 'Show everything', 'never' => 'Never', + 'search_results_for' => 'Search results for ":query"', // create new stuff: 'create_new_withdrawal' => 'Create new withdrawal', @@ -28,6 +29,10 @@ return [ 'create_new_piggy_bank' => 'Create new piggy bank', 'create_new_bill' => 'Create new bill', + // currencies: + 'create_currency' => 'Create new currency', + 'edit_currency' => 'Edit currency ":name"', + // new user: 'submit' => 'Submit', 'getting_started' => 'Getting started', @@ -52,10 +57,12 @@ return [ 'without_budget_between' => 'Transactions without a budget between :start and :end', 'budget_in_month' => ':name in :month', 'delete_budget' => 'Delete budget ":name"', + 'edit_budget' => 'Edit budget ":name"', 'update_amount' => 'Update amount', // bills: 'delete_bill' => 'Delete bill ":name"', + 'edit_bill' => 'Delete bill ":name"', // accounts: 'details_for_asset' => 'Details for asset account ":name"', @@ -97,6 +104,7 @@ return [ // categories: 'new_category' => 'New category', + 'create_new_category' => 'New category', 'without_category' => 'Without a category', 'update_category' => 'Wijzig categorie', 'categories' => 'Categories', @@ -245,6 +253,7 @@ return [ // piggy banks: 'piggy_bank' => 'Piggy bank', 'new_piggy_bank' => 'Create new piggy bank', + 'create_new_piggybank' => 'Create new piggy bank', 'account_status' => 'Account status', 'left_for_piggy_banks' => 'Left for piggy banks', 'sum_of_piggy_banks' => 'Sum of piggy banks', @@ -277,6 +286,12 @@ return [ // tags 'delete_tag' => 'Delete tag ":name"', + 'new_tag' => 'Make new tag', + 'edit_tag' => 'Edit tag ":tag"', + + // reminders + 'reminder_for_piggy' => 'Reminder for piggy bank ":name"', + 'dismissed_reminder_for_piggy' => 'Dismissed reminder for piggy bank ":name"', ]; diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 2a16a86c19..8a5581458a 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -17,6 +17,7 @@ return [ 'to' => 'Tot', 'showEverything' => 'Laat alles zien', 'never' => 'Nooit', + 'search_results_for' => 'Zoekresultaten voor ":query"', // create new stuff: 'create_new_withdrawal' => 'Nieuwe uitgave', @@ -28,6 +29,10 @@ return [ 'create_new_piggy_bank' => 'Nieuw spaarpotje', 'create_new_bill' => 'Nieuw contract', + // currencies: + 'create_currency' => 'Maak nieuwe munteenheid', + 'edit_currency' => 'Wijzig munteenheid ":name"', + // new user: 'submit' => 'Invoeren', 'getting_started' => 'Aan de start!', @@ -52,10 +57,12 @@ return [ 'without_budget_between' => 'Transacties zonder budget tussen :start en :end', 'budget_in_month' => ':name in :month', 'delete_budget' => 'Verwijder budget ":name"', + 'edit_budget' => 'Wijzig budget ":name"', 'update_amount' => 'Bedrag bijwerken', // bills: 'delete_bill' => 'Verwijder contract ":name"', + 'edit_bill' => 'Wijzig contract ":name"', // accounts: 'details_for_asset' => 'Overzicht voor betaalrekening ":name"', @@ -106,6 +113,7 @@ return [ // categories: 'new_category' => 'Nieuwe categorie', + 'create_new_category' => 'Nieuwe categorie', 'without_category' => 'Zonder categorie', 'update_category' => 'Wijzig categorie', 'categories' => 'Categorieën', @@ -254,6 +262,7 @@ return [ // piggy banks: 'piggy_bank' => 'Spaarpotje', 'new_piggy_bank' => 'Nieuw spaarpotje', + 'create_new_piggybank' => 'Nieuw spaarpotje', 'account_status' => 'Rekeningoverzicht', 'left_for_piggy_banks' => 'Over voor spaarpotjes', 'sum_of_piggy_banks' => 'Som van spaarpotjes', @@ -279,11 +288,18 @@ return [ 'expected_amount_per_reminder' => 'Verwacht bedrag per herinnering', 'todo' => 'te doen', 'table' => 'Tabel', + 'piggy_bank_not_exists' => 'Dit spaarpotje bestaat niet meer.', '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"', + 'new_tag' => 'Maak nieuwe tag', + 'edit_tag' => 'Wijzig tag ":tag"', + + // reminders + 'reminder_for_piggy' => 'Herinnering voor spaarpotje ":name"', + 'dismissed_reminder_for_piggy' => 'Genegeerde herinnering voor spaarpotje ":name"', ];