diff --git a/app/Bootstrap/ConfigureLogging.php b/app/Bootstrap/ConfigureLogging.php index 0f9b9d4d65..23dc0980b8 100644 --- a/app/Bootstrap/ConfigureLogging.php +++ b/app/Bootstrap/ConfigureLogging.php @@ -40,4 +40,4 @@ class ConfigureLogging extends IlluminateConfigureLogging $app->make('config')->get('app.log_max_files', 5) ); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 81a75f086b..47dc4eee08 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -30,4 +30,4 @@ class HomeController extends Controller return view('admin.index', compact('title', 'mainTitleIcon')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index ad404e3e9f..9dbc765d07 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -67,4 +67,4 @@ class UserController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 47c76aed89..a0a0055b0d 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -231,4 +231,4 @@ class ReportController extends Controller return $attributes; } -} \ No newline at end of file +} diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 1da6265d7b..a907742790 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -665,6 +665,8 @@ return [ 'category_entry' => 'Expenses in category ":name" between :start and :end', 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end', 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end', + 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.', + 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance', // charts: 'dayOfMonth' => 'Day of the month', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index bb9759532b..132cdc4e8f 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -66,6 +66,7 @@ return [ 'two_factor_lost_fix_owner' => 'Zo niet, stuur dan een e-mail naar :site_owner en vraag of ze je authenticatie in twee stappen willen resetten.', 'warning_much_data' => 'Het kan even duren voor :days dagen aan gegevens geladen zijn.', 'registered' => 'Je bent geregistreerd!', + 'search' => 'Zoeken', // account confirmation: 'confirm_account_header' => 'Bevestig je account', @@ -663,7 +664,9 @@ return [ 'expense_entry' => 'Uitgaven naar rekening ":name" tussen :start en :end', 'category_entry' => 'Uitgaven in categorie ":name" tussen :start en :end', 'budget_spent_amount' => 'Uitgaven in budget ":budget" tussen :start en :end', - 'balance_amount' => 'Uitgaven in :budget betaald van rekening ":account" tussen :start en :end', + 'balance_amount' => 'Uitgaven in :budget betaald van rekening ":account" tussen :start en :end', + 'no_audit_activity' => 'Geen activiteit op betaalrekening :account_name tussen :start en :end.', + 'audit_end_balance' => 'Aan het einde van de dag, :end, was het saldo van betaalrekening :account_name :balance', // charts: 'dayOfMonth' => 'Dag vd maand', diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index 9ad2c38cc3..6c22a737b3 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -8,6 +8,12 @@ */ return [ + 'buttons' => 'Knoppen', + 'icon' => 'Icoon', + 'create_date' => 'Aangemaakt op', + 'update_date' => 'Bijgewerkt op', + 'balance_before' => 'Saldo voor', + 'balance_after' => 'Saldo na', 'name' => 'Naam', 'role' => 'Rol', 'currentBalance' => 'Huidig saldo', diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig index 682658ad32..a24710d1ab 100644 --- a/resources/views/reports/audit/report.twig +++ b/resources/views/reports/audit/report.twig @@ -35,31 +35,44 @@
- Account balance of {{ account.name }} - at the end of {{ auditData[account.id].end }} was: - {{ auditData[account.id].endBalance|formatAmount }} + + {{ trans('firefly.audit_end_balance', + { + account_name: account.name, + url: url, + end: auditData[account.id].end, + balance: auditData[account.id].endBalance|formatAmount + })|raw + }}
{% include 'reports/partials/journals-audit.twig' with {'journals': auditData[account.id].journals,'account':account} %}- Account balance of {{ account.name }} - at the end of {{ auditData[account.id].dayBefore }} was: - {{ auditData[account.id].dayBeforeBalance|formatAmount }} + {{ trans('firefly.audit_end_balance', + { + account_name: account.name, + url: url, + end: auditData[account.id].dayBefore, + balance: auditData[account.id].dayBeforeBalance|formatAmount + })|raw + }}