瀏覽代碼

[minor] add translated get_formatted

version-14
Rushabh Mehta 9 年之前
父節點
當前提交
db128e6c3a
共有 3 個文件被更改,包括 9 次插入3 次删除
  1. +5
    -1
      frappe/model/base_document.py
  2. +1
    -1
      frappe/templates/print_formats/standard_macros.html
  3. +3
    -1
      frappe/utils/formatters.py

+ 5
- 1
frappe/model/base_document.py 查看文件

@@ -577,7 +577,7 @@ class BaseDocument(object):
return self._precision[cache_key][fieldname]


def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False):
def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False, translated=False):
from frappe.utils.formatters import format_value

df = self.meta.get_field(fieldname)
@@ -586,6 +586,10 @@ class BaseDocument(object):
df = get_default_df(fieldname)

val = self.get(fieldname)

if translated:
val = _(val)

if absolute_value and isinstance(val, (int, float)):
val = abs(self.get(fieldname))



+ 1
- 1
frappe/templates/print_formats/standard_macros.html 查看文件

@@ -94,7 +94,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
{% elif df.fieldtype=="HTML" %}
{{ frappe.render_template(df.options, {"doc":doc}) }}
{% else %}
{{ _(doc.get_formatted(df.fieldname, parent_doc or doc)) }}
{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=True) }}
{% endif %}
{%- endmacro %}



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

@@ -7,13 +7,15 @@ from frappe.utils import formatdate, fmt_money, flt, cstr, cint, format_datetime
from frappe.model.meta import get_field_currency, get_field_precision
import re

def format_value(value, df, doc=None, currency=None):
def format_value(value, df, doc=None, currency=None, translated=False):
# Convert dict to object if necessary
if (isinstance(df, dict)):
df = frappe._dict(df)

if value is None:
value = ""
elif translated:
value = frappe._(value)

if not df:
return value


Loading…
取消
儲存