improvments and fixes in Messages

courses/models.py

@@ -949,23 +949,26 @@ class ProfessorMessage(models.Model):
                 bcc_pt_br = [u.email for u in self.users.filter(preferred_language='pt-br', is_active=True) if u.is_active and re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email)]
                 bcc_en = [u.email for u in self.users.filter(preferred_language='en', is_active=True) if re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email)]
 
-                subject_es = self.subject_es or self.subject
-                message_es = self.message_es or self.message
-                subject_es = Template(et.subject).render(Context({'subject': subject_es}))
-                message_es = Template(et.template).render(Context({'message': message_es}))
-                self.send_emails(bcc_es, message_es, subject_es, email_batch_size)
-
-                subject_pt_br = self.subject_pt_br or self.subject
-                message_pt_br = self.message_pt_br or self.message
-                subject_pt_br = Template(et.subject).render(Context({'subject': subject_pt_br}))
-                message_pt_br = Template(et.template).render(Context({'message': message_pt_br}))
-                self.send_emails(bcc_pt_br, message_pt_br, subject_pt_br, email_batch_size)
-
-                subject_en = self.subject_en or self.subject
-                message_en = self.message_en or self.message
-                subject_en = Template(et.subject).render(Context({'subject': subject_en}))
-                message_en = Template(et.template).render(Context({'message': message_en}))
-                self.send_emails(bcc_en, message_en, subject_en, email_batch_size)
+                if bcc_es:
+                    subject_es = self.subject_es or self.subject
+                    message_es = self.message_es or self.message
+                    subject_es = Template(et.subject).render(Context({'subject': subject_es}))
+                    message_es = Template(et.template).render(Context({'message': message_es}))
+                    self.send_emails(bcc_es, message_es, subject_es, email_batch_size)
+
+                if bcc_pt_br:
+                    subject_pt_br = self.subject_pt_br or self.subject
+                    message_pt_br = self.message_pt_br or self.message
+                    subject_pt_br = Template(et.subject).render(Context({'subject': subject_pt_br}))
+                    message_pt_br = Template(et.template).render(Context({'message': message_pt_br}))
+                    self.send_emails(bcc_pt_br, message_pt_br, subject_pt_br, email_batch_size)
+
+                if bcc_en:
+                    subject_en = self.subject_en or self.subject
+                    message_en = self.message_en or self.message
+                    subject_en = Template(et.subject).render(Context({'subject': subject_en}))
+                    message_en = Template(et.template).render(Context({'message': message_en}))
+                    self.send_emails(bcc_en, message_en, subject_en, email_batch_size)
             else:
                 bcc = [u.email for u in self.users.filter(is_active=True) if re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email)]
                 subject = Template(et.subject).render(Context({'subject': self.subject}))
@@ -998,13 +1001,15 @@ class ProfessorMessage(models.Model):
 
         # email the user
         bcc = [user.email]
-        preferred_language = user.preferred_language.replace('-', '_')
 
+        # Ret the subject and message in the user prefered language to send the email
+        preferred_language = user.preferred_language.replace('-', '_')
         subject = getattr(self, 'subject_' + preferred_language) or self.subject
         message = getattr(self, 'message_' + preferred_language) or self.message
 
-        subject = Template(et.subject).render(Context({'subject': self.subject}))
-        message = Template(et.template).render(Context({'message': self.message}))
+        # Render the template
+        subject = Template(et.subject).render(Context({'subject': subject}))
+        message = Template(et.template).render(Context({'message': message}))
         self.send_emails(
             bcc,
             message,