diff --git a/src/program/email.py b/src/program/email.py index 9de5facb..21451fe3 100644 --- a/src/program/email.py +++ b/src/program/email.py @@ -12,70 +12,66 @@ def add_new_speakerproposal_email(speakerproposal): try: content_team = Team.objects.get(camp=speakerproposal.camp, name="Content") - - return add_outgoing_email( - text_template="emails/new_speakerproposal.txt", - html_template="emails/new_speakerproposal.html", - to_recipients=content_team.mailing_list, - formatdict=formatdict, - subject="New speaker proposal for {}".format(speakerproposal.camp.title), - ) except ObjectDoesNotExist as e: logger.info("There is no team with name Content: {}".format(e)) return False + return add_outgoing_email( + text_template="emails/new_speakerproposal.txt", + html_template="emails/new_speakerproposal.html", + to_recipients=content_team.mailing_list, + formatdict=formatdict, + subject="New speaker proposal '%s' was just submitted" % speakerproposal.name, + ) def add_new_eventproposal_email(eventproposal): formatdict = {"proposal": eventproposal} try: content_team = Team.objects.get(camp=eventproposal.camp, name="Content") - - return add_outgoing_email( - text_template="emails/new_eventproposal.txt", - html_template="emails/new_eventproposal.html", - to_recipients=content_team.mailing_list, - formatdict=formatdict, - subject="New event proposal for {}".format(eventproposal.camp.title), - ) except ObjectDoesNotExist as e: logger.info("There is no team with name Content: {}".format(e)) return False + return add_outgoing_email( + text_template="emails/new_eventproposal.txt", + html_template="emails/new_eventproposal.html", + to_recipients=content_team.mailing_list, + formatdict=formatdict, + subject="New event proposal '%s' was just submitted" % eventproposal.title, + ) def add_speakerproposal_updated_email(speakerproposal): formatdict = {"proposal": speakerproposal} try: content_team = Team.objects.get(camp=speakerproposal.camp, name="Content") - - return add_outgoing_email( - text_template="emails/update_speakerproposal.txt", - html_template="emails/update_speakerproposal.html", - to_recipients=content_team.mailing_list, - formatdict=formatdict, - subject="Updated speaker proposal for {}".format( - speakerproposal.camp.title - ), - ) except ObjectDoesNotExist as e: logger.info("There is no team with name Content: {}".format(e)) return False + return add_outgoing_email( + text_template="emails/update_speakerproposal.txt", + html_template="emails/update_speakerproposal.html", + to_recipients=content_team.mailing_list, + formatdict=formatdict, + subject="Speaker proposal '%s' was just updated" % speakerproposal.name, + ) def add_eventproposal_updated_email(eventproposal): formatdict = {"proposal": eventproposal} try: content_team = Team.objects.get(camp=eventproposal.camp, name="Content") - - return add_outgoing_email( - text_template="emails/update_eventproposal.txt", - html_template="emails/update_eventproposal.html", - to_recipients=content_team.mailing_list, - formatdict=formatdict, - subject="New event proposal for {}".format(eventproposal.camp.title), - ) except ObjectDoesNotExist as e: logger.info("There is no team with name Content: {}".format(e)) return False + + return add_outgoing_email( + text_template="emails/update_eventproposal.txt", + html_template="emails/update_eventproposal.html", + to_recipients=content_team.mailing_list, + formatdict=formatdict, + subject="Event proposal '%s' was just updated" % eventproposal.title, + ) + diff --git a/src/program/templates/emails/new_eventproposal.html b/src/program/templates/emails/new_eventproposal.html index ed94257b..1bdd67d1 100644 --- a/src/program/templates/emails/new_eventproposal.html +++ b/src/program/templates/emails/new_eventproposal.html @@ -1,6 +1,6 @@ Hello!

-Event {{ proposal.title }} was just submitted as a new proposal for {{ proposal.camp }}. +Event "{{ proposal.title }}" was just submitted as a new proposal for {{ proposal.camp }}.

More info here. diff --git a/src/program/templates/emails/new_eventproposal.txt b/src/program/templates/emails/new_eventproposal.txt index c8ca1ae7..6189875a 100644 --- a/src/program/templates/emails/new_eventproposal.txt +++ b/src/program/templates/emails/new_eventproposal.txt @@ -1,6 +1,6 @@ Hello! -Event {{ proposal.title }} was just submitted as a new proposal for {{ proposal.camp }}. +Event "{{ proposal.title }}" was just submitted as a new proposal for {{ proposal.camp }}. More info: https://bornhack.dk/admin/program/eventproposal/{{ proposal.uuid }}/change/ diff --git a/src/program/templates/emails/new_speakerproposal.html b/src/program/templates/emails/new_speakerproposal.html index 277f5be8..ecedad75 100644 --- a/src/program/templates/emails/new_speakerproposal.html +++ b/src/program/templates/emails/new_speakerproposal.html @@ -1,6 +1,6 @@ Hello!

-Speaker {{ proposal.name }} was just submitted as a new proposal for {{ proposal.camp }}. +Speaker "{{ proposal.name }}" was just submitted as a new proposal for {{ proposal.camp }}.

More info here. diff --git a/src/program/templates/emails/new_speakerproposal.txt b/src/program/templates/emails/new_speakerproposal.txt index 9078b823..584aadc2 100644 --- a/src/program/templates/emails/new_speakerproposal.txt +++ b/src/program/templates/emails/new_speakerproposal.txt @@ -1,6 +1,6 @@ Hello! -Speaker {{ proposal.name }} was just submitted as a new proposal for {{ proposal.camp }}. +Speaker "{{ proposal.name }}" was just submitted as a new proposal for {{ proposal.camp }}. More info: https://bornhack.dk/admin/program/speakerproposal/{{ proposal.uuid }}/change/ diff --git a/src/program/templates/emails/update_eventproposal.html b/src/program/templates/emails/update_eventproposal.html index c701d535..d3855fc6 100644 --- a/src/program/templates/emails/update_eventproposal.html +++ b/src/program/templates/emails/update_eventproposal.html @@ -1,6 +1,6 @@ Hello!

-Event {{ proposal.name }} for {{ proposal.camp }} was just updated! +Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated!

More info here. diff --git a/src/program/templates/emails/update_eventproposal.txt b/src/program/templates/emails/update_eventproposal.txt index f0c87ce3..f29ba96a 100644 --- a/src/program/templates/emails/update_eventproposal.txt +++ b/src/program/templates/emails/update_eventproposal.txt @@ -1,6 +1,6 @@ Hello! -Event {{ proposal.name }} for {{ proposal.camp }} was just updated! +Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated! More info: https://bornhack.dk/admin/program/eventproposal/{{ proposal.uuid }}/change/ diff --git a/src/program/templates/emails/update_speakerproposal.html b/src/program/templates/emails/update_speakerproposal.html index 838e9b6e..64e4a213 100644 --- a/src/program/templates/emails/update_speakerproposal.html +++ b/src/program/templates/emails/update_speakerproposal.html @@ -1,6 +1,6 @@ Hello!

-Speaker {{ proposal.name }} for {{ proposal.camp }} was just updated! +Speaker "{{ proposal.name }}" for {{ proposal.camp }} was just updated!

More info here. diff --git a/src/program/templates/emails/update_speakerproposal.txt b/src/program/templates/emails/update_speakerproposal.txt index c5d2e46a..052b236e 100644 --- a/src/program/templates/emails/update_speakerproposal.txt +++ b/src/program/templates/emails/update_speakerproposal.txt @@ -1,6 +1,6 @@ Hello! -Speaker {{ proposal.name }} was just submitted as a new speaker proposal for {{ proposal.camp }}. +Speaker "{{ proposal.name }}" was just submitted as a new speaker proposal for {{ proposal.camp }}. More info: https://bornhack.dk/admin/program/speakerproposal/{{ proposal.uuid }}/change/