From d5b08ca36f5cb73c3cf8084b92ce68677a5d0f6a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 1 Jan 2020 09:29:12 +0530 Subject: [PATCH 1/2] fix: Use _ for translation since frappe._ is not supported --- frappe/templates/emails/energy_points_summary.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/templates/emails/energy_points_summary.html b/frappe/templates/emails/energy_points_summary.html index c560a24cfc..3cbc6e97cb 100644 --- a/frappe/templates/emails/energy_points_summary.html +++ b/frappe/templates/emails/energy_points_summary.html @@ -2,7 +2,7 @@

{{ _('Top Performer') }} 🏆

{{ frappe.get_fullname(top_performer.user) }} - {{ frappe._('gained {0} points').format(frappe.utils.cint(top_performer.energy_points)) }} + {{ _('gained {0} points').format(frappe.utils.cint(top_performer.energy_points)) }}

{% endif %} @@ -11,7 +11,7 @@

{{ _('Top Reviewer') }} ❤️

{{ frappe.get_fullname(top_reviewer.user) }} - {{ frappe._('gave {0} points').format(frappe.utils.cint(top_reviewer.given_points)) }} + {{ _('gave {0} points').format(frappe.utils.cint(top_reviewer.given_points)) }}

@@ -24,9 +24,9 @@ - - - + + + {% for user in standings %} From f343d15995b50433d5fd151af313827e9d98b494 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 1 Jan 2020 09:34:37 +0530 Subject: [PATCH 2/2] fix: Remove _ & _dict from frappe because add_module_properties ignores it --- frappe/utils/safe_exec.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 5bc2a3157a..62d0286e03 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -48,11 +48,9 @@ def get_safe_globals(): # make available limited methods of frappe json=json, dict=dict, + _dict=frappe._dict, frappe=frappe._dict( - _=frappe._, - _dict=frappe._dict, flags=frappe.flags, - format=frappe.format_value, format_value=frappe.format_value, date_format=date_format,
# {{ frappe._('User') }}{{ frappe._('Energy Points') }}{{ frappe._('Points Given') }}{{ _('User') }}{{ _('Energy Points') }}{{ _('Points Given') }}