From 3d0455f1f74e27b72c1ea44ee8a244dec8a22c72 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 18 Jul 2019 18:16:07 +0530 Subject: [PATCH 1/2] feat: added lang_dict to frappe.boot --- frappe/website/doctype/web_form/templates/web_form.html | 2 +- frappe/website/doctype/web_form/web_form.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index f6ac2c7d26..dc9450642a 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -79,7 +79,7 @@ frappe.boot = { }; // for backward compatibility of some libs frappe.sys_defaults = frappe.boot.sysdefaults; - +frappe.boot.lang_dict = {{ lang_dict }}; $(".file-size").each(function() { $(this).text(frappe.form.formatters.FileSize($(this).text())); }); diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 484ebc7e27..d1bb80a9ed 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -10,6 +10,7 @@ from frappe.website.utils import get_comment_list from frappe.custom.doctype.customize_form.customize_form import docfield_properties from frappe.core.doctype.file.file import get_max_file_size from frappe.core.doctype.file.file import remove_file_by_url +from frappe.translate import get_lang_dict from frappe.modules.utils import export_module_json, get_doc_module from six.moves.urllib.parse import urlencode from frappe.integrations.utils import get_payment_gateway_controller @@ -173,6 +174,7 @@ def get_context(context): context.max_attachment_size = get_max_file_size() / 1024 / 1024 context.show_in_grid = self.show_in_grid + context.lang_dict = frappe.as_json(get_lang_dict()) def load_document(self, context): '''Load document `doc` and `layout` properties for template''' From 34e77d0cadf79fdff90d63c82680500811ee2cdb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 18 Jul 2019 19:15:48 +0530 Subject: [PATCH 2/2] feat (web-form): enabled translations for web_forms --- frappe/website/doctype/web_form/templates/web_form.html | 2 +- frappe/website/doctype/web_form/web_form.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index dc9450642a..eb16f24fa1 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -79,7 +79,7 @@ frappe.boot = { }; // for backward compatibility of some libs frappe.sys_defaults = frappe.boot.sysdefaults; -frappe.boot.lang_dict = {{ lang_dict }}; +frappe._messages = {{ translated_messages }}; $(".file-size").each(function() { $(this).text(frappe.form.formatters.FileSize($(this).text())); }); diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index d1bb80a9ed..0ba80a4591 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -10,7 +10,6 @@ from frappe.website.utils import get_comment_list from frappe.custom.doctype.customize_form.customize_form import docfield_properties from frappe.core.doctype.file.file import get_max_file_size from frappe.core.doctype.file.file import remove_file_by_url -from frappe.translate import get_lang_dict from frappe.modules.utils import export_module_json, get_doc_module from six.moves.urllib.parse import urlencode from frappe.integrations.utils import get_payment_gateway_controller @@ -174,7 +173,11 @@ def get_context(context): context.max_attachment_size = get_max_file_size() / 1024 / 1024 context.show_in_grid = self.show_in_grid - context.lang_dict = frappe.as_json(get_lang_dict()) + self.load_translations(context) + + def load_translations(self, context): + translated_messages = frappe.translate.get_dict('doctype', self.doc_type) + context.translated_messages = frappe.as_json(translated_messages) def load_document(self, context): '''Load document `doc` and `layout` properties for template'''