浏览代码

[fix] pass language selected on email dialogue while enqueuing the function (#4808)

version-14
Saurabh 7 年前
committed by Nabin Hait
父节点
当前提交
410e6cadd7
共有 3 个文件被更改,包括 9 次插入2 次删除
  1. +7
    -1
      frappe/__init__.py
  2. +1
    -0
      frappe/email/queue.py
  3. +1
    -1
      frappe/public/js/frappe/views/communication.js

+ 7
- 1
frappe/__init__.py 查看文件

@@ -1250,7 +1250,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, html=None,
else: else:
return html return html


def attach_print(doctype, name, file_name=None, print_format=None, style=None, html=None, doc=None):
def attach_print(doctype, name, file_name=None, print_format=None, style=None, html=None, doc=None, lang=None):
from frappe.utils import scrub_urls from frappe.utils import scrub_urls


if not file_name: file_name = name if not file_name: file_name = name
@@ -1258,6 +1258,10 @@ def attach_print(doctype, name, file_name=None, print_format=None, style=None, h


print_settings = db.get_singles_dict("Print Settings") print_settings = db.get_singles_dict("Print Settings")


_lang = local.lang

#set lang as specified in print format attachment
if lang: local.lang = lang
local.flags.ignore_print_permissions = True local.flags.ignore_print_permissions = True


if int(print_settings.send_print_as_pdf or 0): if int(print_settings.send_print_as_pdf or 0):
@@ -1272,6 +1276,8 @@ def attach_print(doctype, name, file_name=None, print_format=None, style=None, h
} }


local.flags.ignore_print_permissions = False local.flags.ignore_print_permissions = False
#reset lang to original local lang
local.lang = _lang


return out return out




+ 1
- 0
frappe/email/queue.py 查看文件

@@ -168,6 +168,7 @@ def get_email_queue(recipients, sender, subject, **kwargs):
if att.get('fid'): if att.get('fid'):
_attachments.append(att) _attachments.append(att)
elif att.get("print_format_attachment") == 1: elif att.get("print_format_attachment") == 1:
att['lang'] = frappe.local.lang
_attachments.append(att) _attachments.append(att)
e.attachments = json.dumps(_attachments) e.attachments = json.dumps(_attachments)




+ 1
- 1
frappe/public/js/frappe/views/communication.js 查看文件

@@ -273,7 +273,7 @@ frappe.views.CommunicationComposer = Class.extend({
this.lang_code = doc.language this.lang_code = doc.language


//On selection of language retrieve language code //On selection of language retrieve language code
$(fields.language_sel.input).click(function(){
$(fields.language_sel.input).change(function(){
me.lang_code = this.value me.lang_code = this.value
}) })




正在加载...
取消
保存