Browse Source

[fix] send email in same language as user

version-14
Rushabh Mehta 9 years ago
parent
commit
2c81227706
2 changed files with 8 additions and 5 deletions
  1. +4
    -4
      frappe/core/doctype/communication/communication.py
  2. +4
    -1
      frappe/tasks.py

+ 4
- 4
frappe/core/doctype/communication/communication.py View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import
import frappe import frappe
import json import json
from email.utils import formataddr, parseaddr from email.utils import formataddr, parseaddr
from frappe.utils import get_url, get_formatted_email, cstr, cint, validate_email_add, split_emails
from frappe.utils import get_url, get_formatted_email, cint, validate_email_add, split_emails
from frappe.utils.file_manager import get_file from frappe.utils.file_manager import get_file
import frappe.email.smtp import frappe.email.smtp
from frappe import _ from frappe import _
@@ -106,7 +106,7 @@ class Communication(Document):
from frappe.tasks import sendmail from frappe.tasks import sendmail
sendmail.delay(frappe.local.site, self.name, sendmail.delay(frappe.local.site, self.name,
print_html=print_html, print_format=print_format, attachments=attachments, print_html=print_html, print_format=print_format, attachments=attachments,
recipients=recipients, cc=cc)
recipients=recipients, cc=cc, lang=frappe.local.lang)


def _notify(self, print_html=None, print_format=None, attachments=None, def _notify(self, print_html=None, print_format=None, attachments=None,
recipients=None, cc=None): recipients=None, cc=None):
@@ -285,7 +285,7 @@ class Communication(Document):


if email_address in exclude: if email_address in exclude:
continue continue
if is_cc: if is_cc:
is_user_enabled = frappe.db.get_value("User", email_address, "enabled") is_user_enabled = frappe.db.get_value("User", email_address, "enabled")
if is_user_enabled==0: if is_user_enabled==0:
@@ -296,7 +296,7 @@ class Communication(Document):
if email_address not in email_address_list: if email_address not in email_address_list:
# append the full email i.e. "Human <human@example.com>" # append the full email i.e. "Human <human@example.com>"
filtered.append(email) filtered.append(email)
email_address_list.append(email_address)
email_address_list.append(email_address)


return filtered return filtered




+ 4
- 1
frappe/tasks.py View File

@@ -186,10 +186,13 @@ def run_async_task(self, site=None, user=None, cmd=None, form_dict=None, hijack_


@celery_task() @celery_task()
def sendmail(site, communication_name, print_html=None, print_format=None, attachments=None, def sendmail(site, communication_name, print_html=None, print_format=None, attachments=None,
recipients=None, cc=None):
recipients=None, cc=None, lang=None):
try: try:
frappe.connect(site=site) frappe.connect(site=site)


if lang:
frappe.local.lang = lang

# upto 3 retries # upto 3 retries
for i in xrange(3): for i in xrange(3):
try: try:


Loading…
Cancel
Save