diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 4a64f3989d..1d590443b2 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -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: diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php index 35df8fbdc5..b097328550 100644 --- a/resources/lang/en_US/config.php +++ b/resources/lang/en_US/config.php @@ -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', diff --git a/resources/views/accounts/reconcile/edit.twig b/resources/views/accounts/reconcile/edit.twig index 852cf47d6b..9eb2e06b99 100644 --- a/resources/views/accounts/reconcile/edit.twig +++ b/resources/views/accounts/reconcile/edit.twig @@ -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)) }} diff --git a/resources/views/accounts/reconcile/overview.twig b/resources/views/accounts/reconcile/overview.twig index 7116cf6ed4..914a897bf6 100644 --- a/resources/views/accounts/reconcile/overview.twig +++ b/resources/views/accounts/reconcile/overview.twig @@ -21,7 +21,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig index 92e4b6e535..dd503dec9c 100644 --- a/resources/views/accounts/reconcile/show.twig +++ b/resources/views/accounts/reconcile/show.twig @@ -44,7 +44,7 @@ - +
{{ 'submitted_start_balance'|_ }} ({{ start.formatLocalized(monthAndDayFormat) }}){{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }}) {{ formatAmountByAccount(account, startBalance) }}
{{ formatAmountByAccount(account, clearedAmount) }}
{{ 'submitted_end_balance'|_ }} ({{ end.formatLocalized(monthAndDayFormat) }}){{ 'submitted_end_balance'|_ }} ({{ end.isoFormat(monthAndDayFormat) }}) {{ formatAmountByAccount(account, endBalance) }}
{{ trans('list.date') }}{{ journal.date.formatLocalized(monthAndDayFormat) }}{{ journal.date.isoFormat(monthAndDayFormat) }}
diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twig index 0b3389205e..891e988d8c 100644 --- a/resources/views/accounts/reconcile/transactions.twig +++ b/resources/views/accounts/reconcile/transactions.twig @@ -28,7 +28,7 @@ - {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }} + {{ trans('firefly.start_of_reconcile_period', {period: start.isoFormat(monthAndDayFormat) }) }} @@ -49,7 +49,7 @@ - {{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }} + {{ trans('firefly.end_of_reconcile_period', {period: end.isoFormat(monthAndDayFormat) }) }} @@ -133,7 +133,7 @@ - {{ journal.date.formatLocalized(monthAndDayFormat) }} + {{ journal.date.isoFormat(monthAndDayFormat) }} @@ -163,7 +163,7 @@ - {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }} + {{ trans('firefly.start_of_reconcile_period', {period: start.isoFormat(monthAndDayFormat) }) }} diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index b6d45b3a14..6eb878e1a8 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -13,7 +13,7 @@

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

@@ -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 %} diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig index d8c8129119..426fba58d5 100644 --- a/resources/views/admin/users/index.twig +++ b/resources/views/admin/users/index.twig @@ -37,11 +37,11 @@ {{ user.email }} - {{ user.created_at.formatLocalized(monthAndDayFormat) }} + {{ user.created_at.isoFormat(monthAndDayFormat) }} {{ user.created_at.format('H:i') }} - {{ user.updated_at.formatLocalized(monthAndDayFormat) }} + {{ user.updated_at.isoFormat(monthAndDayFormat) }} {{ user.updated_at.format('H:i') }} diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig index 7945607bd5..04aef4cd7e 100644 --- a/resources/views/admin/users/show.twig +++ b/resources/views/admin/users/show.twig @@ -25,7 +25,7 @@ {{ trans('list.created_at') }} - {{ user.created_at.formatLocalized(monthAndDayFormat) }} + {{ user.created_at.isoFormat(monthAndDayFormat) }} {{ user.created_at.format('H:i') }} diff --git a/resources/views/budgets/available-budgets/create-alternative.twig b/resources/views/budgets/available-budgets/create-alternative.twig index d212385217..126dbb4713 100644 --- a/resources/views/budgets/available-budgets/create-alternative.twig +++ b/resources/views/budgets/available-budgets/create-alternative.twig @@ -5,7 +5,7 @@

{{ trans('firefly.update_budget_amount_range', - {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}

diff --git a/resources/views/budgets/available-budgets/create.twig b/resources/views/budgets/available-budgets/create.twig index 9a77295ea4..a26a0933e5 100644 --- a/resources/views/budgets/available-budgets/create.twig +++ b/resources/views/budgets/available-budgets/create.twig @@ -5,7 +5,7 @@

{{ trans('firefly.update_budget_amount_range', - {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}

diff --git a/resources/views/budgets/available-budgets/edit.twig b/resources/views/budgets/available-budgets/edit.twig index bdb04fc34b..aeec8fdc1d 100644 --- a/resources/views/budgets/available-budgets/edit.twig +++ b/resources/views/budgets/available-budgets/edit.twig @@ -5,7 +5,7 @@

{{ 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)}) }}

diff --git a/resources/views/budgets/budget-limits/create.twig b/resources/views/budgets/budget-limits/create.twig index be92a9849b..ce0c05d06a 100644 --- a/resources/views/budgets/budget-limits/create.twig +++ b/resources/views/budgets/budget-limits/create.twig @@ -5,7 +5,7 @@

{{ 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}) }}

diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index ebd3de9690..3494c525b1 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -27,7 +27,7 @@
← - {{ periodTitle }} {{ trans('firefly.total_available_budget_in_currency', {currency: defaultCurrency.name}) }}
- {{ trans('firefly.between_dates_breadcrumb', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.between_dates_breadcrumb', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
@@ -73,7 +73,7 @@ {# info about the amount spent #}
{{ 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) }) }} : {{ formatAmountBySymbol(0, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }} @@ -84,7 +84,7 @@ {# info text to show how much is spent (in currency). #}
- {{ trans('firefly.spent_between', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.spent_between', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }} : {{ formatAmountBySymbol(spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }}
@@ -116,7 +116,7 @@

{{ trans('firefly.total_available_budget_in_currency', {currency: budget.transaction_currency.name}) }}
- {{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.formatLocalized(monthAndDayFormat), end: budget.end_date.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }}

@@ -132,7 +132,7 @@ {# info about the amount spent #}
{{ 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) }) }} : {{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }} @@ -166,7 +166,7 @@ {# info text to show how much is spent (in currency). #}
- {{ trans('firefly.spent_between', {start: budget.start_date.formatLocalized(monthAndDayFormat), end: budget.end_date.formatLocalized(monthAndDayFormat)}) }} + {{ 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) }}
@@ -408,7 +408,7 @@

- {{ 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)}) }}

diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index 5f501882f7..059b10de74 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -11,7 +11,7 @@

{% 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 @@

- {{ limit.start_date.formatLocalized(monthAndDayFormat) }} — - {{ limit.end_date.formatLocalized(monthAndDayFormat) }} + {{ limit.start_date.isoFormat(monthAndDayFormat) }} — + {{ limit.end_date.isoFormat(monthAndDayFormat) }}

diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index cb9786cd55..923f307a51 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -12,7 +12,7 @@

- {{ 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) }) }}

diff --git a/resources/views/index.twig b/resources/views/index.twig index 7f8d544df3..5d7b5c9bea 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -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 %} diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig index c470d93b5a..4108e9625a 100644 --- a/resources/views/list/accounts.twig +++ b/resources/views/list/accounts.twig @@ -85,7 +85,7 @@ {% if account.lastActivityDate %} - {{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }} + {{ account.lastActivityDate.isoFormat(monthAndDayFormat) }} {% else %} diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig index 7438f4311e..81686e662d 100644 --- a/resources/views/list/categories.twig +++ b/resources/views/list/categories.twig @@ -31,7 +31,7 @@ {% if category.lastActivity %} - {{ category.lastActivity.formatLocalized(monthAndDayFormat) }} + {{ category.lastActivity.isoFormat(monthAndDayFormat) }} {% else %} diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig index 4548c33a3c..3be6a895b9 100644 --- a/resources/views/list/groups.twig +++ b/resources/views/list/groups.twig @@ -204,7 +204,7 @@ {% endif %} - {{ transaction.date.formatLocalized(monthAndDayFormat) }} + {{ transaction.date.isoFormat(monthAndDayFormat) }} {% if 'Cash account' == transaction.source_account_type %} diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig index 26765de16d..e89391c1b9 100644 --- a/resources/views/list/piggy-bank-events.twig +++ b/resources/views/list/piggy-bank-events.twig @@ -16,9 +16,9 @@ {% if event.transaction_journal_id %} {{ event.date.formatLocalized(monthAndDayFormat) }} + title="{{ event.transactionJournal.description }}">{{ event.date.isoFormat(monthAndDayFormat) }} {% else %} - {{ event.date.formatLocalized(monthAndDayFormat) }} + {{ event.date.isoFormat(monthAndDayFormat) }} {% endif %} diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index d4dfbbe2a1..1615c4fafc 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -68,7 +68,7 @@ {{ 'start_date'|_ }} {% if piggyBank.startdate %} - {{ piggyBank.startdate.formatLocalized(monthAndDayFormat) }} + {{ piggyBank.startdate.isoFormat(monthAndDayFormat) }} {% else %} {{ 'no_start_date'|_ }} {% endif %} @@ -78,7 +78,7 @@ {{ 'target_date'|_ }} {% if piggyBank.targetdate %} - {{ piggyBank.targetdate.formatLocalized(monthAndDayFormat) }} + {{ piggyBank.targetdate.isoFormat(monthAndDayFormat) }} {% else %} {{ 'no_target_date'|_ }} {% endif %} diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig index 90ff182770..3ebbea0ff1 100644 --- a/resources/views/popup/list/journals.twig +++ b/resources/views/popup/list/journals.twig @@ -95,7 +95,7 @@ - {{ transaction.date.formatLocalized(monthAndDayFormat) }} + {{ transaction.date.isoFormat(monthAndDayFormat) }} {% if not hideSource %} diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig index c0d779ae57..b27f9240c7 100644 --- a/resources/views/popup/report/balance-amount.twig +++ b/resources/views/popup/report/balance-amount.twig @@ -3,7 +3,7 @@
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig index ca6fc60058..c06c6df4eb 100644 --- a/resources/views/popup/report/budget-spent-amount.twig +++ b/resources/views/popup/report/budget-spent-amount.twig @@ -3,7 +3,7 @@
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig index ac2b1059a7..25b0b4a70c 100644 --- a/resources/views/popup/report/category-entry.twig +++ b/resources/views/popup/report/category-entry.twig @@ -3,7 +3,7 @@
+ id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}

{% set hideCategory = true %} diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig index e6d27a5a77..dbc7c7b029 100644 --- a/resources/views/popup/report/expense-entry.twig +++ b/resources/views/popup/report/expense-entry.twig @@ -3,7 +3,7 @@
+ id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
{% set hideDestination = true %} diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig index 6f6d5c7d26..c49306440c 100644 --- a/resources/views/popup/report/income-entry.twig +++ b/resources/views/popup/report/income-entry.twig @@ -3,7 +3,7 @@
+ id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }}
{% set hideBudget = true %} diff --git a/resources/views/recurring/index.twig b/resources/views/recurring/index.twig index 4ed51ada5f..437ad9dc10 100644 --- a/resources/views/recurring/index.twig +++ b/resources/views/recurring/index.twig @@ -90,7 +90,7 @@ {% if null != rt.repeat_until and today > rt.repeat_until %} - {{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.formatLocalized(monthAndDayFormat) }) }} + {{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.isoFormat(monthAndDayFormat) }) }} {% endif %}
    @@ -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 %} -
  • {{ occ.formatLocalized(monthAndDayFormat) }}
    • +
  • {{ occ.isoFormat(monthAndDayFormat) }}
    • {% endif %} {% endfor %} {% endfor %} diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig index 28e0b7bd17..09f1a4260f 100644 --- a/resources/views/recurring/show.twig +++ b/resources/views/recurring/show.twig @@ -54,7 +54,7 @@
    {% if null != array.repeat_until and today > array.repeat_until %} - {{ trans('firefly.repeat_until_in_past', {date: array.repeat_until.formatLocalized(monthAndDayFormat) }) }} + {{ trans('firefly.repeat_until_in_past', {date: array.repeat_until.isoFormat(monthAndDayFormat) }) }} {% endif %}
      @@ -69,7 +69,7 @@ {% endif %}
        {% for occ in rep.occurrences %} -
      • {{ occ.formatLocalized(trans('config.month_and_date_day')) }}
        • +
      • {{ occ.isoFormat(trans('config.month_and_date_day_js')) }}
        • {% endfor %}
      diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig index c455d9a731..dfd2ee2ede 100644 --- a/resources/views/reports/audit/report.twig +++ b/resources/views/reports/audit/report.twig @@ -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 }} diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig index 19722deb21..4387d3df02 100644 --- a/resources/views/reports/partials/bills.twig +++ b/resources/views/reports/partials/bills.twig @@ -23,7 +23,7 @@ {% for date in bill.expected_dates %} - {{ date.formatLocalized(monthAndDayFormat) }}
      + {{ date.isoFormat(monthAndDayFormat) }}
      {% endfor %} @@ -31,7 +31,7 @@ {% for journals in bill.paid_moments %} {% for journal in journals %} {% set hitCount = hitCount+1 %} - {{ journal.description }}, {{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
      @@ -51,7 +51,7 @@ {{ line.getBill.name }}
      - {{ 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) }) }}       {{ formatAmountByCurrency(line.getCurrency, line.getMin) }} diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig index 56b80cc5b5..0c362e2aab 100644 --- a/resources/views/reports/partials/budgets.twig +++ b/resources/views/reports/partials/budgets.twig @@ -29,9 +29,9 @@ {% if null != budget_limit.budget_limit_id %} - {{ budget_limit.start_date.formatLocalized(monthAndDayFormat) }} + {{ budget_limit.start_date.isoFormat(monthAndDayFormat) }} — - {{ budget_limit.end_date.formatLocalized(monthAndDayFormat) }} + {{ budget_limit.end_date.isoFormat(monthAndDayFormat) }} {% endif %} diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig index d88485ebb5..653adcfd7d 100644 --- a/resources/views/reports/partials/journals-audit.twig +++ b/resources/views/reports/partials/journals-audit.twig @@ -111,7 +111,7 @@ {{ formatAmountBySymbol(journal.balance_after, auditData[account.id].currency.symbol, auditData[account.id].currency.decimal_places) }} - {{ journal.date.formatLocalized(monthAndDayFormat) }} + {{ journal.date.isoFormat(monthAndDayFormat) }} {{ journal.source_account_name }} @@ -138,42 +138,42 @@ - {{ journal.created_at.formatLocalized(dateTimeFormat) }} + {{ journal.created_at.isoFormat(dateTimeFormat) }} - {{ journal.updated_at.formatLocalized(dateTimeFormat) }} + {{ journal.updated_at.isoFormat(dateTimeFormat) }} {% if null != journal.interest_date %} - {{ journal.interest_date.formatLocalized(monthAndDayFormat) }} + {{ journal.interest_date.isoFormat(monthAndDayFormat) }} {% endif %} {% if null != journal.book_date %} - {{ journal.book_date.formatLocalized(monthAndDayFormat) }} + {{ journal.book_date.isoFormat(monthAndDayFormat) }} {% endif %} {% if null != journal.process_date %} - {{ journal.process_date.formatLocalized(monthAndDayFormat) }} + {{ journal.process_date.isoFormat(monthAndDayFormat) }} {% endif %} {% if null != journal.due_date %} - {{ journal.due_date.formatLocalized(monthAndDayFormat) }} + {{ journal.due_date.isoFormat(monthAndDayFormat) }} {% endif %} {% if null != journal.payment_date %} - {{ journal.payment_date.formatLocalized(monthAndDayFormat) }} + {{ journal.payment_date.isoFormat(monthAndDayFormat) }} {% endif %} {% if null != journal.invoice_date %} - {{ journal.invoice_date.formatLocalized(monthAndDayFormat) }} + {{ journal.invoice_date.isoFormat(monthAndDayFormat) }} {% endif %} diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twig index 9fcd16a9cd..30c62242a7 100644 --- a/resources/views/reports/partials/top-transactions.twig +++ b/resources/views/reports/partials/top-transactions.twig @@ -15,7 +15,7 @@ {{ transaction.description }} - {{ transaction.date.formatLocalized(monthAndDayFormat) }} + {{ transaction.date.isoFormat(monthAndDayFormat) }} diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig index 18d1c4cf62..ea453360bc 100644 --- a/resources/views/tags/index.twig +++ b/resources/views/tags/index.twig @@ -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 %}{% endif %}{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}{% endif %}
    {% endfor %} diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig index 7171dd5e86..9fc09f8b99 100644 --- a/resources/views/tags/show.twig +++ b/resources/views/tags/show.twig @@ -43,7 +43,7 @@ {{ trans('list.date') }} - {{ tag.date.formatLocalized(monthAndDayFormat) }} + {{ tag.date.isoFormat(monthAndDayFormat) }} {% endif %} diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig index 3f85c20af8..509a35838f 100644 --- a/resources/views/transactions/bulk/edit.twig +++ b/resources/views/transactions/bulk/edit.twig @@ -63,7 +63,7 @@ - {{ journal.date.formatLocalized(monthAndDayFormat) }} + {{ journal.date.isoFormat(monthAndDayFormat) }} {% if journal.category_id != null %} {{ journal.category_name }} diff --git a/resources/views/transactions/mass/delete.twig b/resources/views/transactions/mass/delete.twig index 8cbd9b8b48..4fdd545fd0 100644 --- a/resources/views/transactions/mass/delete.twig +++ b/resources/views/transactions/mass/delete.twig @@ -83,7 +83,7 @@ {% endif %} - {{ journal.date.formatLocalized(monthAndDayFormat) }} + {{ journal.date.isoFormat(monthAndDayFormat) }} {{ trans('list.date') }} - {{ first.date.formatLocalized(dateTimeFormat) }} + {{ first.date.isoFormat(dateTimeFormat) }} @@ -285,7 +285,7 @@ {% if journalHasMeta(journal.transaction_journal_id, dateField) %} {{ trans('list.'~dateField) }} - {{ journalGetMetaDate(journal.transaction_journal_id, dateField).formatLocalized(monthAndDayFormat) }} + {{ journalGetMetaDate(journal.transaction_journal_id, dateField).isoFormat(monthAndDayFormat) }} {% endif %} {% endfor %}