diff --git a/frappe/__init__.py b/frappe/__init__.py index d9c872bb67..a32a163b89 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '7.2.30' +__version__ = '7.2.31' __title__ = "Frappe Framework" local = Local() @@ -42,6 +42,9 @@ def _(msg, lang=None): """Returns translated string in current lang, if exists.""" from frappe.translate import get_full_dict + if not hasattr(local, 'lang'): + local.lang = lang or 'en' + if not lang: lang = local.lang diff --git a/frappe/email/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py index e42a17ac36..e4338c6f23 100755 --- a/frappe/email/doctype/email_alert/email_alert.py +++ b/frappe/email/doctype/email_alert/email_alert.py @@ -210,4 +210,4 @@ def evaluate_alert(doc, alert, event): frappe.throw(_("Error while evaluating Email Alert {0}. Please fix your template.").format(alert)) def get_context(doc): - return {"doc": doc, "nowdate": nowdate} \ No newline at end of file + return {"doc": doc, "nowdate": nowdate, "frappe.utils": frappe.utils} \ No newline at end of file