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/run.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ihatemoney/run.py') 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(): -- cgit v1.1