almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-29 01:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when a localized email template is missing (#592)

Browse source 
(cherry picked from commit 08bb95422b)
This commit is contained in:
zorun 2020-04-26 23:12:33 +02:00 committed by Baptiste Jonglez
parent 7df66f5809
commit b4f51867b6
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ihatemoney/utils.py
View file

@ -8,7 +8,8 @@ import operator
from io import BytesIO, StringIO from io import BytesIO, StringIO
import jinja2 import jinja2
from json import dumps, JSONEncoder from json import dumps, JSONEncoder
from flask import redirect, current_app from flask import redirect, current_app, render_template
from flask_babel import get_locale
from babel import Locale from babel import Locale
from werkzeug.routing import HTTPException, RoutingException from werkzeug.routing import HTTPException, RoutingException
import six import six
@ -251,3 +252,15 @@ def eval_arithmetic_expression(expr):
raise ValueError("Error evaluating expression: {}".format(expr)) raise ValueError("Error evaluating expression: {}".format(expr))
return result return result
def render_localized_template(template_name_prefix, **context):
"""Like render_template(), but selects the right template according to the
current user language. Fallback to English if a template for the
current language does not exist.
"""
fallback = "en"
templates = ["{}.{}.j2".format(template_name_prefix, lang)
for lang in (get_locale().language, fallback)]
# render_template() supports a list of templates to try in order
return render_template(templates, **context)

24
ihatemoney/web.py
View file

@ -27,7 +27,7 @@ from ihatemoney.forms import (
AdminAuthenticationForm, AuthenticationForm, EditProjectForm, AdminAuthenticationForm, AuthenticationForm, EditProjectForm,
InviteForm, MemberForm, PasswordReminder, ResetPasswordForm, ProjectForm, get_billform_for InviteForm, MemberForm, PasswordReminder, ResetPasswordForm, ProjectForm, get_billform_for
) )
from ihatemoney.utils import Redirect303, list_of_dicts2json, list_of_dicts2csv, LoginThrottler from ihatemoney.utils import Redirect303, list_of_dicts2json, list_of_dicts2csv, LoginThrottler, render_localized_template
main = Blueprint("main", __name__) main = Blueprint("main", __name__)
@ -242,8 +242,7 @@ def create_project():
message_title = _("You have just created '%(project)s' " message_title = _("You have just created '%(project)s' "
"to share your expenses", project=g.project.name) "to share your expenses", project=g.project.name)
message_body = render_template("reminder_mail.%s.j2" % message_body = render_localized_template("reminder_mail")
get_locale().language)
msg = Message(message_title, msg = Message(message_title,
body=message_body, body=message_body,
@ -272,11 +271,15 @@ def remind_password():
# get the project # get the project
project = Project.query.get(form.id.data) project = Project.query.get(form.id.data)
# send a link to reset the password # send a link to reset the password
password_reminder = "password_reminder.%s.j2" % get_locale().language current_app.mail.send(
current_app.mail.send(Message( Message(
"password recovery", "password recovery",
body=render_template(password_reminder, project=project), body=render_localized_template(
recipients=[project.contact_email])) "password_reminder", project=project
),
recipients=[project.contact_email],
)
)
return redirect(url_for(".password_reminder_sent")) return redirect(url_for(".password_reminder_sent"))
return render_template("password_reminder.html", form=form) return render_template("password_reminder.html", form=form)
@ -402,10 +405,7 @@ def invite():
if request.method == "POST": if request.method == "POST":
if form.validate(): if form.validate():
# send the email # send the email
message_body = render_localized_template("invitation_mail")
message_body = render_template("invitation_mail.%s.j2" %
get_locale().language)
message_title = _("You have been invited to share your " message_title = _("You have been invited to share your "
"expenses for %(project)s", project=g.project.name) "expenses for %(project)s", project=g.project.name)
msg = Message(message_title, msg = Message(message_title,