From 7193a7784007cc161b8df04ccfe8a3b6dc921428 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 24 May 2015 15:13:07 +0200 Subject: [PATCH] Some translations and cleanup [skip ci] --- app/Http/Controllers/AccountController.php | 7 ++++--- app/Http/Controllers/JsonController.php | 5 ----- app/Http/routes.php | 1 - app/Models/Preference.php | 2 +- app/Support/Steam.php | 1 - resources/lang/en/firefly.php | 12 +++++++++++- resources/lang/nl/firefly.php | 12 +++++++++++- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index bcc3bb0036..35333b78f9 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -39,7 +39,7 @@ class AccountController extends Controller public function create($what = 'asset') { $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); - $subTitle = 'Create a new ' . e($what) . ' account'; + $subTitle = trans('firefly.make_new_' . $what . '_account'); // put previous url in session if not redirect from store (not "create another"). if (Session::get('accounts.create.fromStore') !== true) { @@ -58,7 +58,8 @@ class AccountController extends Controller */ public function delete(Account $account) { - $subTitle = 'Delete ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"'; + $typeName = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); + $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); // put previous url in session Session::put('accounts.delete.url', URL::previous()); @@ -81,7 +82,7 @@ class AccountController extends Controller $repository->destroy($account); - Session::flash('success', 'The ' . e($typeName) . ' account "' . e($name) . '" was deleted.'); + Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name])); return Redirect::to(Session::get('accounts.delete.url')); } diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index d81e1373d5..b88dc0e0b3 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -122,11 +122,6 @@ class JsonController extends Controller $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount'); - // $amount = 0; - // foreach($set as $entry) { - // //echo $entry->description.' ('.$entry->tags->count().'): ' . $entry->amount."\n"; - // $amount += $entry->amount; - // } return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 0b29fa3385..c44686eda1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -371,7 +371,6 @@ Route::group( * Report Controller */ Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']); - //Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}']); Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']); Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where( ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared'] diff --git a/app/Models/Preference.php b/app/Models/Preference.php index f09327bde3..84ba5ceaf9 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -58,7 +58,7 @@ class Preference extends Model */ public function setDataAttribute($value) { - $this->attributes['data'] = '';//json_encode($value); + $this->attributes['data'] = ''; $this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value)); } diff --git a/app/Support/Steam.php b/app/Support/Steam.php index d94c015e64..d49affdc2d 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -45,7 +45,6 @@ class Steam if (!$ignoreVirtualBalance) { $balance = bcadd($balance, $account->virtual_balance); - //$balance += floatval($account->virtual_balance); } return round($balance, 2); diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index 3501451e7a..585b498ff9 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -30,6 +30,8 @@ return [ 'createBudget' => 'New budget', 'inactiveBudgets' => 'Inactive budgets', + // accounts: + 'details_for_asset' => 'Details for asset account ":name"', 'details_for_expense' => 'Details for expense account ":name"', 'details_for_revenue' => 'Details for revenue account ":name"', @@ -43,6 +45,14 @@ return [ 'edit_expense_account' => 'Edit expense account ":name"', 'edit_revenue_account' => 'Edit revenue account ":name"', + 'delete_asset_account' => 'Delete asset account ":name"', + 'delete_expense_account' => 'Delete expense account ":name"', + 'delete_revenue_account' => 'Delete revenue account ":name"', + + 'asset_deleted' => 'Successfully deleted asset account ":name"', + 'expense_deleted' => 'Successfully deleted expense account ":name"', + 'revenue_deleted' => 'Successfully deleted revenue account ":name"', + 'update_asset_account' => 'Update asset account', 'update_expense_account' => 'Update expense account', 'update_revenue_account' => 'Update revenue account', @@ -56,7 +66,7 @@ return [ 'without_category' => 'Without a category', 'update_category' => 'Wijzig categorie', 'categories' => 'Categories', - 'no_category' => '(no category)', + 'no_category' => '(no category)', 'category' => 'Category', // new user: diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 0848a47e34..ebdec72321 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -30,6 +30,8 @@ return [ 'createBudget' => 'Maak nieuw budget', 'inactiveBudgets' => 'Inactieve budgetten', + // accounts: + 'details_for_asset' => 'Overzicht voor betaalrekening ":name"', 'details_for_expense' => 'Overzicht voor crediteur ":name"', 'details_for_revenue' => 'Overzicht voor debiteur ":name"', @@ -43,6 +45,14 @@ return [ 'edit_expense_account' => 'Wijzig crediteur ":name"', 'edit_revenue_account' => 'Wijzig debiteur ":name"', + 'delete_asset_account' => 'Verwijder betaalrekening ":name"', + 'delete_expense_account' => 'Verwijder crediteur ":name"', + 'delete_revenue_account' => 'Verwijder debiteur ":name"', + + 'asset_deleted' => 'Betaalrekening ":name" is verwijderd.', + 'expense_deleted' => 'Crediteur ":name" is verwijderd.', + 'revenue_deleted' => 'Debiteur ":name" is verwijderd.', + 'update_asset_account' => 'Wijzig betaalrekening', 'update_expense_account' => 'Wijzig crediteur', 'update_revenue_account' => 'Wijzig debiteur', @@ -56,7 +66,7 @@ return [ 'without_category' => 'Zonder categorie', 'update_category' => 'Wijzig categorie', 'categories' => 'Categorieën', - 'no_category' => '(geen categorie)', + 'no_category' => '(geen categorie)', 'category' => 'Categorie', // new user: