Merge pull request #1060 from amakarudze/fix-email-issues

Remove hard-coded email for hello

Author: amakarudze

contact/models.py

@@ -1,5 +1,6 @@
 from smtplib import SMTPException
 
+from django.conf import settings
 from django.core.mail import EmailMessage
 from django.db import models
 from django.utils.translation import gettext_lazy as _
@@ -40,7 +41,7 @@ def save(self, *args, **kwargs):
         email = EmailMessage(
             self._get_subject(),
             self.message,
-            "Django Girls Contact <[email protected]>",
+            f"Django Girls Contact <{settings.DEFAULT_FROM_EMAIL}>",
             [self.sent_to],
             reply_to=[f"{self.name} <{self.email}>"],
             headers={"Reply-To": f"{self.name} <{self.email}>"},
@@ -55,7 +56,7 @@ def save(self, *args, **kwargs):
     def _get_to_email(self):
         if self.event and self.event.email:
             return self.event.email
-        return "[email protected]"
+        return settings.DEFAULT_FROM_EMAIL
 
     def _get_subject(self):
         return f"{self.name} - from the djangogirls.org website"

organize/emails.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.template.loader import render_to_string
 
 from core.emails import send_email
@@ -29,7 +30,7 @@ def send_application_notification(event_application):
             "application": event_application,
         },
     )
-    send_email(content, subject, ["[email protected]"], reply_to=[event_application.get_main_organizer_email()])
+    send_email(content, subject, [settings.DEFAULT_FROM_EMAIL], reply_to=[event_application.get_main_organizer_email()])
 
 
 def send_application_deployed_email(event_application, event, email_password):