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

fix: translate report column labels

Browse source 
(cherry picked from commit f84aee8abe)

# Conflicts:
#	frappe/translate.py
This commit is contained in:
barredterra 2021-04-21 18:16:59 +02:00 • committed by mergify-bot
parent 5e90e66c16
commit bc758b3f69
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/translate.py
View file

@ -444,10 +444,14 @@ def get_messages_from_report(name):
frappe.db.get_value("DocType", report.ref_doctype, "module"))
if report.columns:
<<<<<<< HEAD
messages.extend([(None, report_column.label) for report_column in report.columns])
if report.filters:
messages.extend([(None, report_filter.label) for report_filter in report.filters])
=======
messages.extend([(None, column.label) for column in report.columns])
>>>>>>> f84aee8abe... fix: translate report column labels
if report.query:
messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)])