Browse Source

fix emailling

devel
Dmitry Novikov 7 years ago
parent
commit
252f50bc81
  1. 13
      chatbot/email_bot.py
  2. 28
      taskapp/locale/ru/LC_MESSAGES/django.po
  3. 1
      taskapp/views.py

13
chatbot/email_bot.py

@ -1,6 +1,7 @@
from _socket import gaierror from _socket import gaierror
from smtplib import SMTPException from smtplib import SMTPException
from django.core.mail import send_mail
from django.core.mail import EmailMultiAlternatives
from django.utils.html import strip_tags
from django.conf import settings from django.conf import settings
from chatbot.models import ChatException from chatbot.models import ChatException
@ -10,12 +11,16 @@ def send_notify(msg_text, account, tag='none'):
try: try:
# MessageQueue.objects.push(msg=msg_text, user=account, tag=tag) # MessageQueue.objects.push(msg=msg_text, user=account, tag=tag)
target_email = account.email target_email = account.email
send_mail(
text_content = strip_tags(msg_text)
msg = EmailMultiAlternatives(
subject=getattr(settings, 'COMPANY_NAME', 'Djing notify'), subject=getattr(settings, 'COMPANY_NAME', 'Djing notify'),
message=msg_text,
body=text_content,
from_email=getattr(settings, 'DEFAULT_FROM_EMAIL'), from_email=getattr(settings, 'DEFAULT_FROM_EMAIL'),
recipient_list=(target_email,)
to=(target_email,)
) )
msg.attach_alternative(msg_text, 'text/html')
msg.send()
except SMTPException as e: except SMTPException as e:
raise ChatException('SMTPException: %s' % e) raise ChatException('SMTPException: %s' % e)
except gaierror as e: except gaierror as e:

28
taskapp/locale/ru/LC_MESSAGES/django.po

@ -485,23 +485,23 @@ msgstr "Время ожидания истекло -%(time_left)s"
msgid "fix form errors" msgid "fix form errors"
msgstr "исправте ошибки формы" msgstr "исправте ошибки формы"
#~ msgid "locality %s.\n"
#~ msgstr "с. %s\n"
msgid "Failed tasks"
msgstr "Проваленные задачи"
#~ msgid "Failed tasks"
#~ msgstr "Проваленные задачи"
msgid "All my tasks"
msgstr "Все мои задачи"
#~ msgid "All my tasks"
#~ msgstr "Все мои задачи"
msgid "Completed tasks"
msgstr "Выполненные задачи"
#~ msgid "Completed tasks"
#~ msgstr "Выполненные задачи"
msgid "New tasks"
msgstr "Новые задачи"
#~ msgid "New tasks"
#~ msgstr "Новые задачи"
msgid "Scheduled tasks me"
msgstr "Назначенные мной задачи"
#~ msgid "Scheduled tasks me"
#~ msgstr "Назначенные мной задачи"
msgid "Tasks to be performed"
msgstr "Задачи, которые необходимо выполнить"
#~ msgid "Tasks to be performed"
#~ msgstr "Задачи, которые необходимо выполнить"
msgid "Task has been reminded"
msgstr "Напоминание о задаче отправлено"

1
taskapp/views.py

@ -256,6 +256,7 @@ def remind(request, task_id):
task = get_object_or_404(Task, id=task_id) task = get_object_or_404(Task, id=task_id)
task.save(update_fields=('state',)) task.save(update_fields=('state',))
task.send_notification() task.send_notification()
messages.success(request, _('Task has been reminded'))
except MultipleException as errs: except MultipleException as errs:
for err in errs.err_list: for err in errs.err_list:
messages.add_message(request, messages.constants.ERROR, err) messages.add_message(request, messages.constants.ERROR, err)

Loading…
Cancel
Save