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

Fix #3450

Browse Source
This commit is contained in:
James Cole 2020-06-07 21:42:52 +02:00
parent ca6479ede6
commit 8304ee21f3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,6 +856,8 @@ return [
'auto_budget_rollover_icon' => 'The budget amount will increase periodically', 'auto_budget_rollover_icon' => 'The budget amount will increase periodically',
// bills: // bills:
'not_expected_period' => 'Not expected this period',
'not_or_not_yet' => 'Not (yet)',
'match_between_amounts' => 'Bill matches transactions between :low and :high.', 'match_between_amounts' => 'Bill matches transactions between :low and :high.',
'running_again_loss' => 'Previously linked transactions to this bill may lose their connection, if they (no longer) match the rule(s).', 'running_again_loss' => 'Previously linked transactions to this bill may lose their connection, if they (no longer) match the rule(s).',
'bill_related_rules' => 'Rules related to this bill', 'bill_related_rules' => 'Rules related to this bill',

4
resources/views/v1/list/bills.twig
View File

@ -61,7 +61,7 @@
#} #}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length == 0 and entry.active %} {% if entry.paid_dates|length == 0 and entry.pay_dates|length == 0 and entry.active %}
<td class="paid_in_period text-muted" data-value="0001-01-01"> <td class="paid_in_period text-muted" data-value="0001-01-01">
{{ trans('components.not_expected_period') }} {{ trans('firefly.not_expected_period') }}
</td> </td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}"> <td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }} {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
@ -75,7 +75,7 @@
#} #}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %} {% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %}
<td class="paid_in_period text-danger" data-value="0002-00-00"> <td class="paid_in_period text-danger" data-value="0002-00-00">
{{ trans('components.not_or_not_yet') }} {{ trans('firefly.not_or_not_yet') }}
</td> </td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}"> <td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{% for date in entry.pay_dates %} {% for date in entry.pay_dates %}