IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some new translations and stuff.

Browse Source
This commit is contained in:
James Cole 2016-04-08 17:54:25 +02:00
parent 7699b6b4ea
commit ddb28b78c3
8 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Bootstrap/ConfigureLogging.php
View File

@ -40,4 +40,4 @@ class ConfigureLogging extends IlluminateConfigureLogging
$app->make('config')->get('app.log_max_files', 5)
);
}
}
}

2
app/Http/Controllers/Admin/HomeController.php
View File

@ -30,4 +30,4 @@ class HomeController extends Controller
return view('admin.index', compact('title', 'mainTitleIcon'));
}
}
}

2
app/Http/Controllers/Admin/UserController.php
View File

@ -67,4 +67,4 @@ class UserController extends Controller
}
}
}

2
app/Http/Controllers/Popup/ReportController.php
View File

@ -231,4 +231,4 @@ class ReportController extends Controller
return $attributes;
}
}
}

2
resources/lang/en_US/firefly.php
View File

@ -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 <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
'audit_end_balance' => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
// charts:
'dayOfMonth' => 'Day of the month',

5
resources/lang/nl_NL/firefly.php
View File

@ -66,6 +66,7 @@ return [
'two_factor_lost_fix_owner' => 'Zo niet, stuur dan een e-mail naar <a href="mailto::site_owner">:site_owner</a> 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 <a href=":url" title=":account_name">:account_name</a> tussen :start en :end.',
'audit_end_balance' => 'Aan het einde van de dag, :end, was het saldo van betaalrekening <a href=":url" title=":account_name">:account_name</a> :balance',
// charts:
'dayOfMonth' => 'Dag vd maand',

6
resources/lang/nl_NL/list.php
View File

@ -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',

41
resources/views/reports/audit/report.twig
View File

@ -35,31 +35,44 @@
<div class="box-header with-border">
<h3 class="box-title">{{ account.name }}</h3>
</div>
{% set url = route('accounts.show',account.id) %}
{% if not auditData[account.id].exists %}
<div class="box-body">
<em>
No activity was recorded
on account <a href="{{ route('accounts.show',account.id) }}"
title="{{ account.name }}">{{ account.name }}</a>
between
{{ start }} and
{{ end }}.
{{ trans('firefly.no_audit_activity',
{
account_name: account.name,
url: url,
start: start.formatLocalized(monthAndDayFormat),
end: end.formatLocalized(monthAndDayFormat),
})|raw
}}
</em>
</div>
{% else %}
<div class="box-body table-responsive no-padding">
<p style="padding:10px;">
Account balance of <a href="{{ route('accounts.show',account.id) }}"
title="{{ account.name }}">{{ account.name }}</a>
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
}}
</p>
{% include 'reports/partials/journals-audit.twig' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;">
Account balance of <a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
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
}}
</p>
</div>
{% endif %}