diff options
| -rw-r--r-- | ihatemoney/run.py | 8 | ||||
| -rw-r--r-- | ihatemoney/templates/list_bills.html | 2 | ||||
| -rw-r--r-- | ihatemoney/templates/settle_bills.html | 2 | ||||
| -rw-r--r-- | ihatemoney/templates/sidebar_table_layout.html | 2 | ||||
| -rw-r--r-- | ihatemoney/templates/statistics.html | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/ihatemoney/run.py b/ihatemoney/run.py index e084e5b..15e295b 100644 --- a/ihatemoney/run.py +++ b/ihatemoney/run.py @@ -6,6 +6,7 @@ from flask import Flask, g, render_template, request, session from flask_babel import Babel, format_currency from flask_mail import Mail from flask_migrate import Migrate, stamp, upgrade +from jinja2 import contextfilter from werkzeug.middleware.proxy_fix import ProxyFix from ihatemoney import default_settings @@ -155,7 +156,10 @@ def create_app( # Undocumented currencyformat filter from flask_babel is forwarding to Babel format_currency # We overwrite it to remove the currency sign ¤ when there is no currency - def currencyformat_nc(number, currency, *args, **kwargs): + @contextfilter + def currency(context, number, currency=None, *args, **kwargs): + if currency is None: + currency = context.get("g").project.default_currency """ Same as flask_babel.Babel.currencyformat, but without the "no currency ¤" sign when there is no currency. @@ -167,7 +171,7 @@ def create_app( **kwargs ).strip() - app.jinja_env.filters["currencyformat_nc"] = currencyformat_nc + app.jinja_env.filters["currency"] = currency @babel.localeselector def get_locale(): 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 @@ <tr receiver={{bill.receiver.id}}> <td>{{ bill.ower }}</td> <td>{{ bill.receiver }}</td> - <td>{{ bill.amount|currencyformat_nc(g.project.default_currency) }}</td> + <td>{{ bill.amount|currency }}</td> </tr> {% endfor %} </tbody> 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 %} <td class="balance-value {% if balance[member.id]|round(2) > 0 %}positive{% elif balance[member.id]|round(2) < 0 %}negative{% 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 }} </td> </tr> {%- 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') %} <tr> <td class="d-md-none">{{ stat.member.name }}</td> - <td>{{ stat.paid|currencyformat_nc(g.project.default_currency) }}</td> - <td>{{ stat.spent|currencyformat_nc(g.project.default_currency) }}</td> + <td>{{ stat.paid|currency }}</td> + <td>{{ stat.spent|currency }}</td> </tr> {% endfor %} </tbody> @@ -28,7 +28,7 @@ {% for month in months %} <tr> <td>{{ _(month.strftime("%B")) }} {{ month.year }}</td> - <td>{{ monthly_stats[month.year][month.month]|currencyformat_nc(g.project.default_currency) }}</td> + <td>{{ monthly_stats[month.year][month.month]|currency }}</td> </tr> {% endfor %} </tbody> |