浏览代码

Translate the msg in _ function according to the passed lang, support multiple language in frappe.cash()

version-14
Yaqin Shurrab 8 年前
父节点
当前提交
c28880eb27
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. +2
    -1
      frappe/__init__.py
  2. +3
    -1
      frappe/translate.py

+ 2
- 1
frappe/__init__.py 查看文件

@@ -48,7 +48,8 @@ def _(msg, lang=None):
# msg should always be unicode # msg should always be unicode
msg = as_unicode(msg).strip() msg = as_unicode(msg).strip()


return get_full_dict(local.lang).get(msg) or msg
# Retrun lang_full_dict according to lang passed parameter
return get_full_dict(lang).get(msg) or msg


def as_unicode(text, encoding='utf-8'): def as_unicode(text, encoding='utf-8'):
'''Convert to unicode if required''' '''Convert to unicode if required'''


+ 3
- 1
frappe/translate.py 查看文件

@@ -179,7 +179,9 @@ def get_full_dict(lang):
return {} return {}


# found in local, return! # found in local, return!
if getattr(frappe.local, 'lang_full_dict', None) is not None:
# Check if the passed lang exists in lang_full_dict cash in frappe
if not getattr(frappe.local, 'lang_full_dict',
None) is None and frappe.local.lang_full_dict and lang in frappe.local.lang_full_dict:
return frappe.local.lang_full_dict return frappe.local.lang_full_dict


frappe.local.lang_full_dict = load_lang(lang) frappe.local.lang_full_dict = load_lang(lang)


正在加载...
取消
保存