From 23ed467d37a0b1949c9cd4ef5616058d5448e030 Mon Sep 17 00:00:00 2001 From: Glandos Date: Thu, 21 May 2020 21:31:24 +0200 Subject: Replace currencyformat_nc with currency filter (#625) --- ihatemoney/templates/list_bills.html | 2 +- ihatemoney/templates/settle_bills.html | 2 +- ihatemoney/templates/sidebar_table_layout.html | 2 +- ihatemoney/templates/statistics.html | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ihatemoney/templates') diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html index 1f4235b..487e70e 100644 --- a/ihatemoney/templates/list_bills.html +++ b/ihatemoney/templates/list_bills.html @@ -1,7 +1,7 @@ {% extends "sidebar_table_layout.html" %} {%- macro bill_amount(bill, currency=bill.original_currency, amount=bill.amount) %} - {{ amount|currencyformat_nc(currency) }} ({{ _("%(amount)s each", amount=bill.pay_each_default(amount)|currencyformat_nc(currency)) }}) + {{ amount|currency(currency) }} ({{ _("%(amount)s each", amount=bill.pay_each_default(amount)|currency(currency)) }}) {% endmacro -%} {% block title %} - {{ g.project.name }}{% endblock %} diff --git a/ihatemoney/templates/settle_bills.html b/ihatemoney/templates/settle_bills.html index a9b0dbc..601156c 100644 --- a/ihatemoney/templates/settle_bills.html +++ b/ihatemoney/templates/settle_bills.html @@ -15,7 +15,7 @@ {{ bill.ower }} {{ bill.receiver }} - {{ bill.amount|currencyformat_nc(g.project.default_currency) }} + {{ bill.amount|currency }} {% endfor %} diff --git a/ihatemoney/templates/sidebar_table_layout.html b/ihatemoney/templates/sidebar_table_layout.html index d616e68..b25a3d6 100644 --- a/ihatemoney/templates/sidebar_table_layout.html +++ b/ihatemoney/templates/sidebar_table_layout.html @@ -37,7 +37,7 @@ {%- endif %} {%- endif %} - {% if balance[member.id] | round(2) > 0 %}+{% endif %}{{ balance[member.id]|currencyformat_nc(g.project.default_currency) }} + {% if balance[member.id] | round(2) > 0 %}+{% endif %}{{ balance[member.id]|currency }} {%- endfor %} diff --git a/ihatemoney/templates/statistics.html b/ihatemoney/templates/statistics.html index 3b0a9dd..9e7a10d 100644 --- a/ihatemoney/templates/statistics.html +++ b/ihatemoney/templates/statistics.html @@ -15,8 +15,8 @@ {% for stat in members_stats|sort(attribute='member.name') %} {{ stat.member.name }} - {{ stat.paid|currencyformat_nc(g.project.default_currency) }} - {{ stat.spent|currencyformat_nc(g.project.default_currency) }} + {{ stat.paid|currency }} + {{ stat.spent|currency }} {% endfor %} @@ -28,7 +28,7 @@ {% for month in months %} {{ _(month.strftime("%B")) }} {{ month.year }} - {{ monthly_stats[month.year][month.month]|currencyformat_nc(g.project.default_currency) }} + {{ monthly_stats[month.year][month.month]|currency }} {% endfor %} -- cgit v1.1