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

fix: Resolve conflicts

Browse source
This commit is contained in:
Suraj Shetty 2021-05-03 13:54:12 +05:30 • committed by GitHub
parent dfa8c18248
commit cd6ff896a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/translate.py
View file

@ -444,25 +444,11 @@ def get_messages_from_report(name):
frappe.db.get_value("DocType", report.ref_doctype, "module"))
if report.columns:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf4a73c3d4... fix: translate report filter labels
messages.extend([(None, report_column.label) for report_column in report.columns])
=======
context = "Column of report '%s'" % report.name # context has to match context in `prepare_columns` in query_report.js
messages.extend([(None, report_column.label, context) for report_column in report.columns])
>>>>>>> 6250c4ac9d... fix: add context to filter columns
if report.filters:
messages.extend([(None, report_filter.label) for report_filter in report.filters])
<<<<<<< HEAD
=======
messages.extend([(None, column.label) for column in report.columns])
>>>>>>> f84aee8abe... fix: translate report column labels
=======
>>>>>>> bf4a73c3d4... fix: translate report filter labels
if report.query:
messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)])