Ver a proveniência

[minor] add translated get_formatted

version-14
Rushabh Mehta há 9 anos
ascendente
cometimento
db128e6c3a
3 ficheiros alterados com 9 adições e 3 eliminações
  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 Ver ficheiro

@@ -577,7 +577,7 @@ class BaseDocument(object):
return self._precision[cache_key][fieldname] 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 from frappe.utils.formatters import format_value


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


val = self.get(fieldname) val = self.get(fieldname)

if translated:
val = _(val)

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




+ 1
- 1
frappe/templates/print_formats/standard_macros.html Ver ficheiro

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




+ 3
- 1
frappe/utils/formatters.py Ver ficheiro

@@ -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 from frappe.model.meta import get_field_currency, get_field_precision
import re 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 # Convert dict to object if necessary
if (isinstance(df, dict)): if (isinstance(df, dict)):
df = frappe._dict(df) df = frappe._dict(df)


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


if not df: if not df:
return value return value


Carregando…
Cancelar
Guardar