From bc758b3f69d08b8a26148ffaea5437cc058ad012 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:16:59 +0200 Subject: [PATCH] fix: translate report column labels (cherry picked from commit f84aee8abe858dd61210c21aa5b6d1642dba6ec1) # Conflicts: # frappe/translate.py --- frappe/translate.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/translate.py b/frappe/translate.py index f5f9797d07..624d69a244 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -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)])