IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-22 17:06:39 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
40 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/Range.php
View File

@ -113,8 +113,8 @@ class Range
}
// save some formats:
$monthAndDayFormat = (string)trans('config.month_and_day', [], $locale);
$dateTimeFormat = (string)trans('config.date_time', [], $locale);
$monthAndDayFormat = (string)trans('config.month_and_day_js', [], $locale);
$dateTimeFormat = (string)trans('config.date_time_js', [], $locale);
$defaultCurrency = app('amount')->getDefaultCurrency();
// also format for moment JS:

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

@ -34,6 +34,7 @@ return [
'month_and_day_js' => 'MMMM Do, YYYY',
//'month_and_date_day' => '%A %B %e, %Y',
'month_and_date_day_js' => 'dddd MMMM Do, YYYY',
//'month_and_day_no_year' => '%B %e',
'month_and_day_no_year_js' => 'MMMM Do',

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 %}

4
resources/views/admin/users/index.twig
View File

@ -37,11 +37,11 @@
<td data-value="{{ user.email }}">
<a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td>
<td class="hidden-xs" data-value="{{ user.created_at.format('Y-m-d H-i-s') }}">
{{ user.created_at.formatLocalized(monthAndDayFormat) }}
{{ user.created_at.isoFormat(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }}
</td>
<td class="hidden-xs" data-value="{{ user.updated_at.format('Y-m-d H-i-s') }}">
{{ user.updated_at.formatLocalized(monthAndDayFormat) }}
{{ user.updated_at.isoFormat(monthAndDayFormat) }}
{{ user.updated_at.format('H:i') }}
</td>
<td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}">

2
resources/views/admin/users/show.twig
View File

@ -25,7 +25,7 @@
<tr>
<td>{{ trans('list.created_at') }}</td>
<td>
{{ user.created_at.formatLocalized(monthAndDayFormat) }}
{{ user.created_at.isoFormat(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }}</td>
</tr>
<tr>

2
resources/views/budgets/available-budgets/create-alternative.twig
View File

@ -5,7 +5,7 @@
</button>
<h4 class="modal-title">
{{ trans('firefly.update_budget_amount_range',
{start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
{start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
</h4>
</div>

2
resources/views/budgets/available-budgets/create.twig
View File

@ -5,7 +5,7 @@
</button>
<h4 class="modal-title">
{{ trans('firefly.update_budget_amount_range',
{start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
{start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
</h4>
</div>

2
resources/views/budgets/available-budgets/edit.twig
View File

@ -5,7 +5,7 @@
</button>
<h4 class="modal-title">
{{ trans('firefly.update_budget_amount_range',
{start: availableBudget.start_date.formatLocalized(monthAndDayFormat), end: availableBudget.end_date.formatLocalized(monthAndDayFormat)}) }}
{start: availableBudget.start_date.isoFormat(monthAndDayFormat), end: availableBudget.end_date.isoFormat(monthAndDayFormat)}) }}
</h4>
</div>

2
resources/views/budgets/budget-limits/create.twig
View File

@ -5,7 +5,7 @@
</button>
<h4 class="modal-title">
{{ trans('firefly.set_budget_limit_title',
{start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name}) }}
{start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat), budget: budget.name}) }}
</h4>
</div>

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

@ -27,7 +27,7 @@
<div class="btn btn-group btn-group-lg" style="padding-top:0;">
<a href="{{ route('budgets.index', [prevLoop[0].start.format('Y-m-d'), prevLoop[0].end.format('Y-m-d')]) }}"
class="btn btn-default" title="{{ prevLoop[0].title }}">&larr;</a>
<a title="{{ start.formatLocalized(monthAndDayFormat) }} - {{ end.formatLocalized(monthAndDayFormat) }}"
<a title="{{ start.isoFormat(monthAndDayFormat) }} - {{ end.isoFormat(monthAndDayFormat) }}"
href="{{ route('budgets.index', [start.format('Y-m-d'), end.format('Y-m-d')]) }}"
class="btn btn-default">{{ periodTitle }}</a>
<a href="{{ route('budgets.index', [nextLoop[0].start.format('Y-m-d'), nextLoop[0].end.format('Y-m-d')]) }}"
@ -57,7 +57,7 @@
<h3 class="box-title">
{{ trans('firefly.total_available_budget_in_currency', {currency: defaultCurrency.name}) }}
<br>
<small>{{ trans('firefly.between_dates_breadcrumb', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</small>
<small>{{ trans('firefly.between_dates_breadcrumb', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</small>
</h3>
</div>
<div class="box-body">
@ -73,7 +73,7 @@
{# info about the amount spent #}
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-9" style="text-align:right;margin-bottom:3px;">
<small class="available_bar"
data-id="0">{{ trans('firefly.available_between', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat) }) }}
data-id="0">{{ trans('firefly.available_between', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }}
:
<span class="available_amount" data-id="0" data-value="0" data-currency="{{ defaultCurrency.id }}"
data-value="0">{{ formatAmountBySymbol(0, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }}</span>
@ -84,7 +84,7 @@
{# info text to show how much is spent (in currency). #}
<div class="row spentInfo" data-id="0" data-value="{{ spent }}">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<small>{{ trans('firefly.spent_between', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
<small>{{ trans('firefly.spent_between', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
: {{ formatAmountBySymbol(spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }} </small>
</div>
</div>
@ -116,7 +116,7 @@
<h3 class="box-title">
{{ trans('firefly.total_available_budget_in_currency', {currency: budget.transaction_currency.name}) }}
<br>
<small>{{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.formatLocalized(monthAndDayFormat), end: budget.end_date.formatLocalized(monthAndDayFormat)}) }}</small>
<small>{{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }}</small>
</h3>
</div>
<div class="box-body">
@ -132,7 +132,7 @@
{# info about the amount spent #}
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-9" style="text-align:right;margin-bottom:3px;">
<small class="available_bar"
data-id="{{ budget.id }}">{{ trans('firefly.available_between', {start: budget.start_date.formatLocalized(monthAndDayFormat), end: budget.end_date.formatLocalized(monthAndDayFormat) }) }}
data-id="{{ budget.id }}">{{ trans('firefly.available_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat) }) }}
:
<span class="available_amount" data-id="{{ budget.id }}"
data-value="{{ budget.amount }}">{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}</span>
@ -166,7 +166,7 @@
{# info text to show how much is spent (in currency). #}
<div class="row spentInfo" data-id="{{ budget.id }}">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<small>{{ trans('firefly.spent_between', {start: budget.start_date.formatLocalized(monthAndDayFormat), end: budget.end_date.formatLocalized(monthAndDayFormat)}) }}
<small>{{ trans('firefly.spent_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }}
: {{ formatAmountBySymbol(budget.spent, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places) }} </small>
</div>
</div>
@ -408,7 +408,7 @@
<div class="box-body">
<p>
<a href="{{ route('budgets.no-budget', [start.format('Y-m-d'), end.format('Y-m-d')]) }}">
{{ trans('firefly.transactions_no_budget', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
{{ trans('firefly.transactions_no_budget', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
</a>
</p>
</div>

6
resources/views/budgets/show.twig
View File

@ -11,7 +11,7 @@
<div class="box-header with-border">
<h3 class="box-title">
{% if budgetLimit %}
{{ trans('firefly.chart_budget_in_period', {name: budget.name, start: budgetLimit.start_date.formatLocalized(monthAndDayFormat), end: budgetLimit.end_date.formatLocalized(monthAndDayFormat),currency: budgetLimit.transactionCurrency.name }) }}
{{ trans('firefly.chart_budget_in_period', {name: budget.name, start: budgetLimit.start_date.isoFormat(monthAndDayFormat), end: budgetLimit.end_date.isoFormat(monthAndDayFormat),currency: budgetLimit.transactionCurrency.name }) }}
{% else %}
{{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}
{% endif %}
@ -147,8 +147,8 @@
<div class="box-header with-border">
<h3 class="box-title"><a
href="{{ route('budgets.show.limit',[budget.id,limit.id]) }}">
{{ limit.start_date.formatLocalized(monthAndDayFormat) }} &mdash;
{{ limit.end_date.formatLocalized(monthAndDayFormat) }}
{{ limit.start_date.isoFormat(monthAndDayFormat) }} &mdash;
{{ limit.end_date.isoFormat(monthAndDayFormat) }}
</a>
</h3>
</div>

2
resources/views/categories/show.twig
View File

@ -12,7 +12,7 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
{{ trans('firefly.chart_category_in_period', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.chart_category_in_period', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }}
</h3>
</div>
<div class="box-body">

2
resources/views/index.twig
View File

@ -177,7 +177,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 %}
</script>

2
resources/views/list/accounts.twig
View File

@ -85,7 +85,7 @@
{% if account.lastActivityDate %}
<td class="hidden-sm hidden-xs hidden-md">
<!-- {{ account.lastActivityDate }} -->
{{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
{{ account.lastActivityDate.isoFormat(monthAndDayFormat) }}
</td>
{% else %}
<td class="hidden-sm hidden-xs hidden-md">

2
resources/views/list/categories.twig
View File

@ -31,7 +31,7 @@
</td>
{% if category.lastActivity %}
<td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('Y-m-d H-i-s') }}">
{{ category.lastActivity.formatLocalized(monthAndDayFormat) }}
{{ category.lastActivity.isoFormat(monthAndDayFormat) }}
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="0000-00-00 00-00-00">

2
resources/views/list/groups.twig
View File

@ -204,7 +204,7 @@
{% endif %}
</td>
<td style=" {{ style|raw }}" class="hidden-xs">
{{ transaction.date.formatLocalized(monthAndDayFormat) }}
{{ transaction.date.isoFormat(monthAndDayFormat) }}
</td>
<td style=" {{ style|raw }}">
{% if 'Cash account' == transaction.source_account_type %}

4
resources/views/list/piggy-bank-events.twig
View File

@ -16,9 +16,9 @@
<td>
{% if event.transaction_journal_id %}
<a href="{{ route('transactions.show',event.transactionJournal.transaction_group_id) }}"
title="{{ event.transactionJournal.description }}">{{ event.date.formatLocalized(monthAndDayFormat) }}</a>
title="{{ event.transactionJournal.description }}">{{ event.date.isoFormat(monthAndDayFormat) }}</a>
{% else %}
{{ event.date.formatLocalized(monthAndDayFormat) }}
{{ event.date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>

4
resources/views/piggy-banks/show.twig
View File

@ -68,7 +68,7 @@
<td>{{ 'start_date'|_ }}</td>
<td>
{% if piggyBank.startdate %}
{{ piggyBank.startdate.formatLocalized(monthAndDayFormat) }}
{{ piggyBank.startdate.isoFormat(monthAndDayFormat) }}
{% else %}
<em>{{ 'no_start_date'|_ }}</em>
{% endif %}
@ -78,7 +78,7 @@
<td>{{ 'target_date'|_ }}</td>
<td>
{% if piggyBank.targetdate %}
{{ piggyBank.targetdate.formatLocalized(monthAndDayFormat) }}
{{ piggyBank.targetdate.isoFormat(monthAndDayFormat) }}
{% else %}
<em>{{ 'no_target_date'|_ }}</em>
{% endif %}

2
resources/views/popup/list/journals.twig
View File

@ -95,7 +95,7 @@
</td>
<td class="hidden-sm hidden-xs">
{{ transaction.date.formatLocalized(monthAndDayFormat) }}
{{ transaction.date.isoFormat(monthAndDayFormat) }}
</td>
{% if not hideSource %}

2
resources/views/popup/report/balance-amount.twig
View File

@ -3,7 +3,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
<h4 class="modal-title" id="balanceAmountTitle">{{ trans('firefly.balance_amount',
{budget: budget.name, account: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}
{budget: budget.name, account: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}
) }}</h4>
</div>
<div class="modal-body">

2
resources/views/popup/report/budget-spent-amount.twig
View File

@ -3,7 +3,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
<h4 class="modal-title" id="budgetSpentAmountLabel">
{{ trans('firefly.budget_spent_amount', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name}) }}
{{ trans('firefly.budget_spent_amount', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat), budget: budget.name}) }}
</h4>
</div>
<div class="modal-body">

2
resources/views/popup/report/category-entry.twig
View File

@ -3,7 +3,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
<h4 class="modal-title"
id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</h4>
</div>
<div class="modal-body">
{% set hideCategory = true %}

2
resources/views/popup/report/expense-entry.twig
View File

@ -3,7 +3,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
<h4 class="modal-title"
id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</h4>
</div>
<div class="modal-body">
{% set hideDestination = true %}

2
resources/views/popup/report/income-entry.twig
View File

@ -3,7 +3,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
<h4 class="modal-title"
id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}</h4>
</div>
<div class="modal-body">
{% set hideBudget = true %}

6
resources/views/recurring/index.twig
View File

@ -90,7 +90,7 @@
<td>
{% if null != rt.repeat_until and today > rt.repeat_until %}
<span class="text-danger">
{{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.isoFormat(monthAndDayFormat) }) }}
</span>
{% endif %}
<ul>
@ -119,7 +119,7 @@
{{ 'recurring_repeats_forever'|_ }}.
{% endif %}
{% if null != rt.repeat_until and rt.repetitions == 0 %}
{{ trans('firefly.recurring_repeats_until', {date: rt.repeat_until.formatLocalized(monthAndDayFormat)}) }}.
{{ trans('firefly.recurring_repeats_until', {date: rt.repeat_until.isoFormat(monthAndDayFormat)}) }}.
{% endif %}
{% if null == rt.repeat_until and rt.nr_of_repetitions != 0 %}
{{ trans_choice('firefly.recurring_repeats_x_times', rt.nr_of_repetitions) }}.
@ -131,7 +131,7 @@
{% for rep in rt.repetitions %}
{% for occ in rep.occurrences %}
{% if loop.index0 < 2 %}
<li>{{ occ.formatLocalized(monthAndDayFormat) }}</li>
<li>{{ occ.isoFormat(monthAndDayFormat) }}</li>
{% endif %}
{% endfor %}
{% endfor %}

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

@ -54,7 +54,7 @@
<div class="box-body">
{% if null != array.repeat_until and today > array.repeat_until %}
<span class="text-danger">
{{ trans('firefly.repeat_until_in_past', {date: array.repeat_until.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.repeat_until_in_past', {date: array.repeat_until.isoFormat(monthAndDayFormat) }) }}
</span>
{% endif %}
<ul>
@ -69,7 +69,7 @@
{% endif %}
<ul>
{% for occ in rep.occurrences %}
<li>{{ occ.formatLocalized(trans('config.month_and_date_day')) }}</li>
<li>{{ occ.isoFormat(trans('config.month_and_date_day_js')) }}</li>
{% endfor %}
</ul>
</li>

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

@ -44,8 +44,8 @@
{
account_name: account.name|escape,
url: url,
start: start.formatLocalized(monthAndDayFormat),
end: end.formatLocalized(monthAndDayFormat),
start: start.isoFormat(monthAndDayFormat),
end: end.isoFormat(monthAndDayFormat),
})|raw }}
</em>

6
resources/views/reports/partials/bills.twig
View File

@ -23,7 +23,7 @@
</td>
<td data-value="{{ bill.expected_dates[0].format('Y-m-d')|default('0000-00-00') }}">
{% for date in bill.expected_dates %}
{{ date.formatLocalized(monthAndDayFormat) }}<br/>
{{ date.isoFormat(monthAndDayFormat) }}<br/>
{% endfor %}
</td>
<td style="text-align:right;">
@ -31,7 +31,7 @@
{% for journals in bill.paid_moments %}
{% for journal in journals %}
{% set hitCount = hitCount+1 %}
<a title="{{ journal.date.formatLocalized(monthAndDayFormat) }}"
<a title="{{ journal.date.isoFormat(monthAndDayFormat) }}"
href="{{ route('transactions.show', [journal.transaction_group_id]) }}">{{ journal.description }}</a>,
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
<br/>
@ -51,7 +51,7 @@
<td data-value="{{ line.getBill.name }}">
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
<small class="text-muted"><br/>
{{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }}
{{ trans('firefly.bill_expected_between', {start: line.getPayDate.isoFormat(monthAndDayFormat), end: line.getEndOfPayDate.isoFormat(monthAndDayFormat) }) }}
</small>
</td>
<td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>

4
resources/views/reports/partials/budgets.twig
View File

@ -29,9 +29,9 @@
<td class="hidden-xs" data-value="{{ budget_limit.start_date.format('Y-m-d')|default('0000-00-00') }}">
{% if null != budget_limit.budget_limit_id %}
<a href="{{ route('budgets.show.limit', [budget.budget_id, budget_limit.budget_limit_id]) }}">
{{ budget_limit.start_date.formatLocalized(monthAndDayFormat) }}
{{ budget_limit.start_date.isoFormat(monthAndDayFormat) }}
&mdash;
{{ budget_limit.end_date.formatLocalized(monthAndDayFormat) }}
{{ budget_limit.end_date.isoFormat(monthAndDayFormat) }}
</a>
{% endif %}
</td>

18
resources/views/reports/partials/journals-audit.twig
View File

@ -111,7 +111,7 @@
{{ formatAmountBySymbol(journal.balance_after, auditData[account.id].currency.symbol, auditData[account.id].currency.decimal_places) }}
</td>
<td class="hide-date">{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
<td class="hide-date">{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
<td class="hide-from">
<a href="{{ route('accounts.show', [journal.source_account_id]) }}" title="{{ journal.source_account_iban|default(journal.source_account_name) }}">{{ journal.source_account_name }}</a>
@ -138,42 +138,42 @@
<!-- new optional fields (2x) -->
<td class="hide-create_date">
{{ journal.created_at.formatLocalized(dateTimeFormat) }}
{{ journal.created_at.isoFormat(dateTimeFormat) }}
</td>
<td class="hide-update_date">
{{ journal.updated_at.formatLocalized(dateTimeFormat) }}
{{ journal.updated_at.isoFormat(dateTimeFormat) }}
</td>
<!-- more new dates -->
<td class="hide-interest_date">
{% if null != journal.interest_date %}
{{ journal.interest_date.formatLocalized(monthAndDayFormat) }}
{{ journal.interest_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-book_date">
{% if null != journal.book_date %}
{{ journal.book_date.formatLocalized(monthAndDayFormat) }}
{{ journal.book_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-process_date">
{% if null != journal.process_date %}
{{ journal.process_date.formatLocalized(monthAndDayFormat) }}
{{ journal.process_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-due_date">
{% if null != journal.due_date %}
{{ journal.due_date.formatLocalized(monthAndDayFormat) }}
{{ journal.due_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-payment_date">
{% if null != journal.payment_date %}
{{ journal.payment_date.formatLocalized(monthAndDayFormat) }}
{{ journal.payment_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-invoice_date">
{% if null != journal.invoice_date %}
{{ journal.invoice_date.formatLocalized(monthAndDayFormat) }}
{{ journal.invoice_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
</tr>

2
resources/views/reports/partials/top-transactions.twig
View File

@ -15,7 +15,7 @@
</td>
<td data-value="{{ transaction.description }}">{{ transaction.description }}</td>
<td data-value="{{ transaction.date.format('Y-m-d') }}">
{{ transaction.date.formatLocalized(monthAndDayFormat) }}
{{ transaction.date.isoFormat(monthAndDayFormat) }}
</td><!-- See reference nr. 3 -->
<td style="text-align: right;" data-value="{{ transaction.amount}}"><span
style="margin-right:5px;">

2
resources/views/tags/index.twig
View File

@ -36,7 +36,7 @@
class="label label-success"
style="font-weight: normal;font-size:0.9em;"
title="{{ tagInfo.created_at.formatLocalized(monthAndDayFormat) }}"
title="{{ tagInfo.created_at.isoFormat(monthAndDayFormat) }}"
href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
{% endfor %}

2
resources/views/tags/show.twig
View File

@ -43,7 +43,7 @@
{{ trans('list.date') }}
</td>
<td>
{{ tag.date.formatLocalized(monthAndDayFormat) }}
{{ tag.date.isoFormat(monthAndDayFormat) }}
</td>
</tr>
{% endif %}

2
resources/views/transactions/bulk/edit.twig
View File

@ -63,7 +63,7 @@
</td>
<td>{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
<td>{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
<td>
{% if journal.category_id != null %}
<a href="{{ route('categories.show', [journal.category_id]) }}" title="{{ journal.category_name }}">{{ journal.category_name }}</a>

2
resources/views/transactions/mass/delete.twig
View File

@ -83,7 +83,7 @@
{% endif %}
</td>
<td>
{{ journal.date.formatLocalized(monthAndDayFormat) }}
{{ journal.date.isoFormat(monthAndDayFormat) }}
</td>
<td>
<a href="{{ route('accounts.show', [journal.source_account_id]) }}"

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

@ -62,7 +62,7 @@
<tr>
<td style="width:30%;">{{ trans('list.date') }}</td>
<td>
{{ first.date.formatLocalized(dateTimeFormat) }}
{{ first.date.isoFormat(dateTimeFormat) }}
</td>
</tr>
</tbody>
@ -285,7 +285,7 @@
{% if journalHasMeta(journal.transaction_journal_id, dateField) %}
<tr>
<td>{{ trans('list.'~dateField) }}</td>
<td>{{ journalGetMetaDate(journal.transaction_journal_id, dateField).formatLocalized(monthAndDayFormat) }}</td>
<td>{{ journalGetMetaDate(journal.transaction_journal_id, dateField).isoFormat(monthAndDayFormat) }}</td>
</tr>
{% endif %}
{% endfor %}