From f84aee8abe858dd61210c21aa5b6d1642dba6ec1 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 1/2] fix: translate report column labels --- frappe/translate.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/translate.py b/frappe/translate.py index 3565bbc32c..5989ff44aa 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -443,8 +443,12 @@ def get_messages_from_report(name): messages = _get_messages_from_page_or_report("Report", name, frappe.db.get_value("DocType", report.ref_doctype, "module")) + if report.columns: + messages.extend([(None, column.label) for column in report.columns]) + if report.query: messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)]) + messages.append((None,report.report_name)) return messages From bf4a73c3d4890a42016d49a34d455aad18307068 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:28:02 +0200 Subject: [PATCH 2/2] fix: translate report filter labels --- frappe/translate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/translate.py b/frappe/translate.py index 5989ff44aa..a4128794ac 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -444,7 +444,10 @@ def get_messages_from_report(name): frappe.db.get_value("DocType", report.ref_doctype, "module")) if report.columns: - messages.extend([(None, column.label) for column in report.columns]) + 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]) if report.query: messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)])