kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/8457

Browse Source
This commit is contained in:
James Cole
2024-01-28 16:34:17 +01:00
parent 1f774e0d71
commit 642539e410
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1647,6 +1647,7 @@ return [
'transactionsWithoutBudget' => 'Expenses without budget', 'transactionsWithoutBudget' => 'Expenses without budget',
'transactions_no_budget' => 'Expenses without budget between :start and :end', 'transactions_no_budget' => 'Expenses without budget between :start and :end',
'spent_between' => 'Already spent between :start and :end', 'spent_between' => 'Already spent between :start and :end',
'spent_between_left' => 'Spent :spent between :start and :end, leaving :left.',
'set_available_amount' => 'Set available amount', 'set_available_amount' => 'Set available amount',
'update_available_amount' => 'Update available amount', 'update_available_amount' => 'Update available amount',
'ab_basic_modal_explain' => 'Use this form to indicate how much you expect to be able to budget (in total, in :currency) in the indicated period.', 'ab_basic_modal_explain' => 'Use this form to indicate how much you expect to be able to budget (in total, in :currency) in the indicated period.',

9
resources/views/budgets/index.twig
View File

@@ -154,8 +154,13 @@
{# info text to show how much is spent (in currency). #} {# info text to show how much is spent (in currency). #}
<div class="row spentInfo" data-id="{{ budget.id }}"> <div class="row spentInfo" data-id="{{ budget.id }}">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<small>{{ trans('firefly.spent_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }} <small>{{ trans('firefly.spent_between_left', {
: {{ formatAmountBySymbol(budget.spent, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places) }} </small> start: budget.start_date.isoFormat(monthAndDayFormat),
end: budget.end_date.isoFormat(monthAndDayFormat),
spent: formatAmountBySymbol(budget.spent, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places),
left: formatAmountBySymbol(budget.budgeted + budget.spent, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places),
})|raw }}
</small>
</div> </div>
</div> </div>