Commit 16aa4c96 authored by Matheus Miranda's avatar Matheus Miranda
Browse files

Change language priority

parent a5056bc9
......@@ -799,15 +799,9 @@ class ProfessorMessage(models.Model):
et = EmailTemplate(name="professor-message", subject="{{subject}}", template="{{message|safe}}")
if settings.I18N_SUPPORT:
bcc_en = [u.email for u in self.users.all() if u.is_active and re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email) and u.preferred_language == 'en']
bcc_es = [u.email for u in self.users.all() if u.is_active and re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email) and u.preferred_language == 'es']
bcc_pt_br = [u.email for u in self.users.all() if u.is_active and re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email) and u.preferred_language == 'pt-br']
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)
bcc_en = [u.email for u in self.users.all() if u.is_active and re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", u.email) and u.preferred_language == 'en']
subject_es = self.subject_es or self.subject
message_es = self.message_es or self.message
......@@ -820,6 +814,12 @@ class ProfessorMessage(models.Model):
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)
else:
bcc = [u.email for u in self.users.all() if u.is_active and 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}))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment