From 252f50bc814b324db4aae950b40d08343902c54b Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Wed, 24 Oct 2018 14:16:30 +0300
Subject: [PATCH] fix emailling

---
 chatbot/email_bot.py                    | 13 ++++++++----
 taskapp/locale/ru/LC_MESSAGES/django.po | 28 ++++++++++++-------------
 taskapp/views.py                        |  1 +
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/chatbot/email_bot.py b/chatbot/email_bot.py
index 8e3d809..ccdde95 100644
--- a/chatbot/email_bot.py
+++ b/chatbot/email_bot.py
@@ -1,6 +1,7 @@
 from _socket import gaierror
 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 chatbot.models import ChatException
@@ -10,12 +11,16 @@ def send_notify(msg_text, account, tag='none'):
     try:
         # MessageQueue.objects.push(msg=msg_text, user=account, tag=tag)
         target_email = account.email
-        send_mail(
+        text_content = strip_tags(msg_text)
+
+        msg = EmailMultiAlternatives(
             subject=getattr(settings, 'COMPANY_NAME', 'Djing notify'),
-            message=msg_text,
+            body=text_content,
             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:
         raise ChatException('SMTPException: %s' % e)
     except gaierror as e:
diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po
index ec420a8..1cbbb57 100644
--- a/taskapp/locale/ru/LC_MESSAGES/django.po
+++ b/taskapp/locale/ru/LC_MESSAGES/django.po
@@ -485,23 +485,23 @@ msgstr "Время ожидания истекло -%(time_left)s"
 msgid "fix form errors"
 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 "Напоминание о задаче отправлено"
diff --git a/taskapp/views.py b/taskapp/views.py
index 2e928df..bbf821e 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -256,6 +256,7 @@ def remind(request, task_id):
         task = get_object_or_404(Task, id=task_id)
         task.save(update_fields=('state',))
         task.send_notification()
+        messages.success(request, _('Task has been reminded'))
     except MultipleException as errs:
         for err in errs.err_list:
             messages.add_message(request, messages.constants.ERROR, err)