From 5c58ebe948dc3955fb41b0e0bccba7966a9d3e51 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 23 Mar 2017 14:36:47 +0530 Subject: [PATCH 1/3] [fix] Setup wizard, UnpickleError issue --- frappe/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index d76cbf7f31..45bf6d4a3e 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -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 From ec1f8e445ea8b005bf16e5e98715e625ef15d46e Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 23 Mar 2017 14:59:26 +0530 Subject: [PATCH 2/3] [minor] added frappe.utils in email alerts (#2903) --- frappe/email/doctype/email_alert/email_alert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py index d497b85113..1adac6944b 100755 --- a/frappe/email/doctype/email_alert/email_alert.py +++ b/frappe/email/doctype/email_alert/email_alert.py @@ -197,5 +197,5 @@ 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} From a35cf79a366d3ad73f69fc2aca61306633358d5b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 27 Mar 2017 13:00:57 +0600 Subject: [PATCH 3/3] bumped to version 7.2.31 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 45bf6d4a3e..8117dfa324 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()