diff --git a/frappe/__init__.py b/frappe/__init__.py
index 3251161a92..f5d56e824c 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -48,7 +48,8 @@ def _(msg, lang=None):
 	# msg should always be unicode
 	msg = as_unicode(msg).strip()
 
-	return get_full_dict(local.lang).get(msg) or msg
+	# return lang_full_dict according to lang passed parameter
+	return get_full_dict(lang).get(msg) or msg
 
 def as_unicode(text, encoding='utf-8'):
 	'''Convert to unicode if required'''
diff --git a/frappe/translate.py b/frappe/translate.py
index 80bafac7c8..c143e46f18 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -179,7 +179,7 @@ def get_full_dict(lang):
 		return {}
 
 	# found in local, return!
-	if getattr(frappe.local, 'lang_full_dict', None) is not None:
+	if getattr(frappe.local, 'lang_full_dict', None) and frappe.local.lang_full_dict.get(lang, None):
 		return frappe.local.lang_full_dict
 
 	frappe.local.lang_full_dict = load_lang(lang)