From 6250c4ac9d62b943936e92cef15627534a8a1480 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 21 Apr 2021 19:46:33 +0200 Subject: [PATCH] fix: add context to filter columns --- frappe/public/js/frappe/views/reports/query_report.js | 2 +- frappe/translate.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 834946b437..4e50210d0a 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1094,7 +1094,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { return Object.assign(column, { id: column.fieldname, - name: __(column.label), + name: __(column.label, null, `Column of report '${this.report_name}'`), // context has to match context in get_messages_from_report in translate.py width: parseInt(column.width) || null, editable: false, compareValue: compareFn, diff --git a/frappe/translate.py b/frappe/translate.py index a4128794ac..49e4a0855c 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -444,7 +444,8 @@ def get_messages_from_report(name): frappe.db.get_value("DocType", report.ref_doctype, "module")) if report.columns: - 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]) if report.filters: messages.extend([(None, report_filter.label) for report_filter in report.filters])