kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated function.

Browse Source
This commit is contained in:
James Cole
2022-03-27 20:33:25 +02:00
parent cbf14f541c
commit 2be7813a67
40 changed files with 74 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/accounts/reconcile/edit.twig
View File

@@ -39,7 +39,7 @@
{{ ExpandedForm.nonSelectableAmount('amount',data.amount, {'currency' : data.currency}) }}
{# ALWAYS SHOW DATE #}
{{ ExpandedForm.staticText('date',journal.date.formatLocalized(monthAndDayFormat)) }}
{{ ExpandedForm.staticText('date',journal.date.isoFormat(monthAndDayFormat)) }}
</div>
</div>

4
resources/views/accounts/reconcile/overview.twig
View File

@@ -21,7 +21,7 @@
<table class="table table-striped table-bordered">
<tr>
<td>{{ 'submitted_start_balance'|_ }} ({{ start.formatLocalized(monthAndDayFormat) }})</td>
<td>{{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }})</td>
<td>{{ formatAmountByAccount(account, startBalance) }}</td>
</tr>
<tr>
@@ -33,7 +33,7 @@
<td>{{ formatAmountByAccount(account, clearedAmount) }}</td>
</tr>
<tr>
<td>{{ 'submitted_end_balance'|_ }} ({{ end.formatLocalized(monthAndDayFormat) }})</td>
<td>{{ 'submitted_end_balance'|_ }} ({{ end.isoFormat(monthAndDayFormat) }})</td>
<td>{{ formatAmountByAccount(account, endBalance) }}</td>
</tr>
<tr>

2
resources/views/accounts/reconcile/show.twig
View File

@@ -44,7 +44,7 @@
</tr>
<tr>
<td style="width:30%;">{{ trans('list.date') }}</td>
<td>{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
<td>{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
</tr>
</tbody>
</table>

8
resources/views/accounts/reconcile/transactions.twig
View File

@@ -28,7 +28,7 @@
</td>
<td colspan="3">
<span class="label label-default">
{{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.start_of_reconcile_period', {period: start.isoFormat(monthAndDayFormat) }) }}
</span>
</td>
<td colspan="2">
@@ -49,7 +49,7 @@
</td>
<td colspan="3">
<span class="label label-default">
{{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.end_of_reconcile_period', {period: end.isoFormat(monthAndDayFormat) }) }}
</span>
</td>
<td colspan="2">
@@ -133,7 +133,7 @@
</td>
<td class="hidden-sm hidden-xs">
{{ journal.date.formatLocalized(monthAndDayFormat) }}
{{ journal.date.isoFormat(monthAndDayFormat) }}
</td>
<td class="hidden-xs hidden-sm hidden-md">
@@ -163,7 +163,7 @@
</td>
<td colspan="3">
<span class="label label-default">
{{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.start_of_reconcile_period', {period: start.isoFormat(monthAndDayFormat) }) }}
</span>
</td>
<td colspan="2">

4
resources/views/accounts/show.twig
View File

@@ -13,7 +13,7 @@
<h3 class="box-title">
{{ trans('firefly.chart_account_in_period', {
balance: formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true),
name: account.name|escape, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat) })|raw }}
name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
</h3>
<div class="box-tools pull-right">
<div class="btn-group">
@@ -193,7 +193,7 @@
var drawVerticalLine = '';
{# render vertical line with text "today" #}
{% if start.lte(today) and end.gte(today) %}
drawVerticalLine = '{{ today.formatLocalized(monthAndDayFormat) }}';
drawVerticalLine = '{{ today.isoFormat(monthAndDayFormat) }}';
{% endif %}
{% endif %}