Fixed merge conflict

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
 

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}
+	return {"doc": doc, "nowdate": nowdate, "frappe.utils": frappe.utils}