瀏覽代碼

[fix] frappe._ source message should always be converted to unicode

version-14
Anand Doshi 9 年之前
父節點
當前提交
5040314fb5
共有 1 個檔案被更改,包括 6 行新增1 行删除
  1. +6
    -1
      frappe/__init__.py

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

@@ -40,13 +40,18 @@ class _dict(dict):


def _(msg, lang=None): def _(msg, lang=None):
"""Returns translated string in current lang, if exists.""" """Returns translated string in current lang, if exists."""
from frappe.translate import get_full_dict
from frappe.utils import cstr

if not lang: if not lang:
lang = local.lang lang = local.lang


# msg should always be unicode
msg = cstr(msg)

if lang == "en": if lang == "en":
return msg return msg


from frappe.translate import get_full_dict
return get_full_dict(local.lang).get(msg) or msg return get_full_dict(local.lang).get(msg) or msg


def get_lang_dict(fortype, name=None): def get_lang_dict(fortype, name=None):


Loading…
取消
儲存