almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-02 03:02:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
zorun 2020-04-26 23:12:33 +02:00 committed by GitHub
parent 342292ca9f
commit 08bb95422b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ihatemoney/utils.py
View file

@ -9,7 +9,8 @@ import os
import re import re
from babel import Locale from babel import Locale
from flask import current_app, redirect from flask import current_app, redirect, render_template
from flask_babel import get_locale
import jinja2 import jinja2
from werkzeug.routing import HTTPException, RoutingException from werkzeug.routing import HTTPException, RoutingException
@ -278,3 +279,17 @@ class FormEnum(Enum):
def __str__(self): def __str__(self):
return str(self.value) return str(self.value)
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 = [
f"{template_name_prefix}.{lang}.j2"
for lang in (get_locale().language, fallback)
]
# render_template() supports a list of templates to try in order
return render_template(templates, **context)

16
ihatemoney/web.py
View file

@ -30,7 +30,7 @@ from flask import (
session, session,
url_for, url_for,
) )
from flask_babel import get_locale, gettext as _ from flask_babel import gettext as _
from flask_mail import Message from flask_mail import Message
from sqlalchemy import orm from sqlalchemy import orm
from sqlalchemy_continuum import Operation from sqlalchemy_continuum import Operation
@ -57,6 +57,7 @@ from ihatemoney.utils import (
get_members, get_members,
list_of_dicts2csv, list_of_dicts2csv,
list_of_dicts2json, list_of_dicts2json,
render_localized_template,
same_bill, same_bill,
) )
@ -301,7 +302,7 @@ def create_project():
project=g.project.name, project=g.project.name,
) )
message_body = render_template(f"reminder_mail.{get_locale().language}.j2") message_body = render_localized_template("reminder_mail")
msg = Message( msg = Message(
message_title, body=message_body, recipients=[project.contact_email] message_title, body=message_body, recipients=[project.contact_email]
@ -335,11 +336,12 @@ 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 = f"password_reminder.{get_locale().language}.j2"
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(
"password_reminder", project=project
),
recipients=[project.contact_email], recipients=[project.contact_email],
) )
) )
@ -566,11 +568,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(
f"invitation_mail.{get_locale().language}.j2"
)
message_title = _( message_title = _(
"You have been invited to share your " "expenses for %(project)s", "You have been invited to share your " "expenses for %(project)s",
project=g.project.name, project=g.project.name,