vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fixed merge conflict

Browse source
This commit is contained in:
Nabin Hait 2017-03-27 12:33:13 +05:30
commit c8e1001572
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/__init__.py
View file

@ -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

2
frappe/email/doctype/email_alert/email_alert.py
View file

@ -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}