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

resolve conflict, apply reviewer changes

Browse source
This commit is contained in:
Yaqin Shurrab 2017-03-05 12:54:39 +02:00
commit c6f3350bae
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -48,7 +48,7 @@ def _(msg, lang=None):
# msg should always be unicode
msg = as_unicode(msg).strip()
# retrun lang_full_dict according to lang passed parameter
# 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'):

1
frappe/translate.py
View file

@ -178,6 +178,7 @@ def get_full_dict(lang):
if not lang:
return {}
# found in local, return!
if getattr(frappe.local, 'lang_full_dict', {}).get(lang, None):
return frappe.local.lang_full_dict