From 5040314fb5134bc0a2420161159c77c5069101fb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 18 Jan 2016 12:29:56 +0530 Subject: [PATCH] [fix] frappe._ source message should always be converted to unicode --- frappe/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f31b58cd91..b7b844762d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -40,13 +40,18 @@ class _dict(dict): def _(msg, lang=None): """Returns translated string in current lang, if exists.""" + from frappe.translate import get_full_dict + from frappe.utils import cstr + if not lang: lang = local.lang + # msg should always be unicode + msg = cstr(msg) + if lang == "en": return msg - from frappe.translate import get_full_dict return get_full_dict(local.lang).get(msg) or msg def get_lang_dict(fortype, name=None):