kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3467 from sephrat/days-left-for-bills

Browse Source 
Fix #3437
This commit is contained in:
James Cole
2020-06-17 18:23:13 +00:00
committed by GitHub
parent c8f1e4bbd7 16a511cf79
commit b7f48a19e8
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -890,7 +890,8 @@ return [
'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files',
'list_inactive_rule' => 'inactive rule',
'bill_edit_rules' => 'Firefly III will attempt to edit the rule related to this bill as well. If you\'ve edited this rule yourself however, Firefly III won\'t change anything.|Firefly III will attempt to edit the :count rules related to this bill as well. If you\'ve edited these rules yourself however, Firefly III won\'t change anything.',
'bill_expected_date' => 'Expected :date',
// accounts:
'inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.',
'all_accounts_inactive' => 'These are your inactive accounts.',

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

@@ -75,11 +75,10 @@
#}
{% 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">
{{ trans('firefly.not_or_not_yet') }}
{{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }}
</td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{% for date in entry.pay_dates %}
{#{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}<br>#}
{{ formatDate(date, monthAndDayFormat) }}<br>
{% endfor %}