From 8aa2e3d2f5c21c0c19734e995f634baa4db85949 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 2 Jan 2017 15:22:30 +0100 Subject: [PATCH] Various code cleanup. --- .env.example | 4 +++- app/Validation/FireflyValidator.php | 9 +++++++++ config/firefly.php | 2 +- public/js/ff/accounts/show.js | 1 + resources/lang/en_US/demo.php | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 28d87ce566..87540a4f1c 100755 --- a/.env.example +++ b/.env.example @@ -40,6 +40,7 @@ SHOW_INCOMPLETE_TRANSLATIONS=false CACHE_PREFIX=firefly +GOOGLE_MAPS_API_KEY= ANALYTICS_ID= SITE_OWNER=mail@example.com @@ -48,4 +49,5 @@ PUSHER_SECRET= PUSHER_APP_ID= DEMO_USERNAME= -DEMO_PASSWORD= \ No newline at end of file +DEMO_PASSWORD= + diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index b5bdf896a2..778996bb88 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -53,6 +53,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @@ -71,6 +72,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @param $parameters @@ -94,6 +96,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @@ -115,6 +118,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @@ -144,6 +148,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @param $parameters @@ -256,6 +261,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @param $parameters @@ -286,6 +292,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @param $parameters @@ -319,6 +326,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * Validate an object and its unicity. Checks for encryption / encrypted values as well. * * parameter 0: the table @@ -356,6 +364,7 @@ class FireflyValidator extends Validator } /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @param $attribute * @param $value * @param $parameters diff --git a/config/firefly.php b/config/firefly.php index 7b4632912e..444a786cd6 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -112,7 +112,7 @@ return [ 'Cash account' => 'cash', ], 'languages' => [ - 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German', 'complete' => false], + 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German', 'complete' => true], 'en_US' => ['name_locale' => 'English', 'name_english' => 'English', 'complete' => true], 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish', 'complete' => false], 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French', 'complete' => false], diff --git a/public/js/ff/accounts/show.js b/public/js/ff/accounts/show.js index 12851e0d75..a1db23e92a 100644 --- a/public/js/ff/accounts/show.js +++ b/public/js/ff/accounts/show.js @@ -92,4 +92,5 @@ function sortStop(event, ui) { $(this).animate({backgroundColor: originalBG}, 200); return undefined; }); + return undefined; } diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php index 6cd5476b57..e7f8ea934d 100644 --- a/resources/lang/en_US/demo.php +++ b/resources/lang/en_US/demo.php @@ -11,7 +11,7 @@ return [ 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', - 'accounts-index' => 'Asset accounts are your personal bank ac counts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.', + 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.', 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.', 'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the -icon in the top right corner.', 'reports-index-examples' => 'Be sure to check out these examples: a monthly financial overview, a yearly financial overview and a budget overview.',