diff --git a/get_together/management/commands/create_next_in_series.py b/get_together/management/commands/create_next_in_series.py index 1cde738..6e3f4ab 100644 --- a/get_together/management/commands/create_next_in_series.py +++ b/get_together/management/commands/create_next_in_series.py @@ -29,7 +29,7 @@ def email_host_new_event(event): 'event': event, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] New event: %s' % event.name + email_subject = 'New event: %s' % event.name email_body_text = render_to_string('get_together/emails/events/event_from_series.txt', context) email_body_html = render_to_string('get_together/emails/events/event_from_series.html', context) email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') diff --git a/get_together/management/commands/send_daily_attendee_update.py b/get_together/management/commands/send_daily_attendee_update.py index b8b513f..7993d1d 100644 --- a/get_together/management/commands/send_daily_attendee_update.py +++ b/get_together/management/commands/send_daily_attendee_update.py @@ -45,7 +45,7 @@ def send_new_attendees(event, new_attendees): 'site': Site.objects.get(id=1) } - email_subject = '[GetTogether] New event attendees' + email_subject = 'New event attendees' email_body_text = render_to_string('get_together/emails/events/new_event_attendees.txt', context) email_body_html = render_to_string('get_together/emails/events/new_event_attendees.html', context) email_recipients = [host.email for host in hosts] diff --git a/get_together/management/commands/send_daily_member_update.py b/get_together/management/commands/send_daily_member_update.py index 2c5bbcf..f76e7e6 100644 --- a/get_together/management/commands/send_daily_member_update.py +++ b/get_together/management/commands/send_daily_member_update.py @@ -45,7 +45,7 @@ def send_new_members(team, new_members): 'site': Site.objects.get(id=1) } - email_subject = '[GetTogether] New team members' + email_subject = 'New team members' email_body_text = render_to_string('get_together/emails/teams/new_team_members.txt', context) email_body_html = render_to_string('get_together/emails/teams/new_team_members.html', context) email_recipients = [admin.email for admin in admins] diff --git a/get_together/management/commands/send_email_confirmation_reminder.py b/get_together/management/commands/send_email_confirmation_reminder.py index 137170b..d4ef793 100644 --- a/get_together/management/commands/send_email_confirmation_reminder.py +++ b/get_together/management/commands/send_email_confirmation_reminder.py @@ -42,7 +42,7 @@ class Command(BaseCommand): 'confirmation': confirmation_request, 'confirmation_url': confirmation_url, } - email_subject = '[GetTogether] Email confirmation reminder' + email_subject = 'Email confirmation reminder' email_body_text = render_to_string('get_together/emails/users/confirm_email.txt', context) email_body_html = render_to_string('get_together/emails/users/confirm_email.html', context) email_recipients = [account.user.email] diff --git a/get_together/management/commands/send_event_reminder.py b/get_together/management/commands/send_event_reminder.py index 5f070c8..69cccd7 100644 --- a/get_together/management/commands/send_event_reminder.py +++ b/get_together/management/commands/send_event_reminder.py @@ -41,7 +41,7 @@ class Command(BaseCommand): 'event': attendee.event, } - email_subject = '[GetTogether] Upcoming event reminder' + email_subject = 'Upcoming event reminder' email_body_text = render_to_string('get_together/emails/events/reminder.txt', context) email_body_html = render_to_string('get_together/emails/events/reminder.html', context) email_recipients = [attendee.user.user.email] diff --git a/get_together/views/events.py b/get_together/views/events.py index e7e3aeb..be075c7 100644 --- a/get_together/views/events.py +++ b/get_together/views/events.py @@ -365,7 +365,7 @@ def invite_attendee(email, event, sender): recipient = email email = recipient.email - email_subject = '[GetTogether] Invite to attend %s' % event.name + email_subject = 'Invitation to attend: %s' % event.name email_body_text = render_to_string('get_together/emails/events/attendee_invite.txt', context) email_body_html = render_to_string('get_together/emails/events/attendee_invite.html', context) email_recipients = [email] @@ -396,7 +396,7 @@ def contact_attendee(attendee, body, sender): 'body': body, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] Message about %s' % attendee.event.name + email_subject = 'A message about: %s' % attendee.event.name email_body_text = render_to_string('get_together/emails/events/attendee_contact.txt', context) email_body_html = render_to_string('get_together/emails/events/attendee_contact.html', context) email_recipients = [attendee.user.user.email] @@ -487,7 +487,7 @@ def send_comment_emails(comment): 'comment': comment, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] Comment on %s' % comment.event.name + email_subject = 'New comment on: %s' % comment.event.name email_body_text = render_to_string('get_together/emails/events/event_comment.txt', context) email_body_html = render_to_string('get_together/emails/events/event_comment.html', context) email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') diff --git a/get_together/views/new_user.py b/get_together/views/new_user.py index beacaa1..cf66c6b 100644 --- a/get_together/views/new_user.py +++ b/get_together/views/new_user.py @@ -145,7 +145,7 @@ def user_send_confirmation_email(request): 'confirmation': confirmation_request, 'confirmation_url': confirmation_url, } - email_subject = '[GetTogether] Confirm email address' + email_subject = 'Confirm your email address' email_body_text = render_to_string('get_together/emails/users/confirm_email.txt', context, request) email_body_html = render_to_string('get_together/emails/users/confirm_email.html', context, request) email_recipients = [request.user.email] diff --git a/get_together/views/speakers.py b/get_together/views/speakers.py index 105e119..9d69d01 100644 --- a/get_together/views/speakers.py +++ b/get_together/views/speakers.py @@ -282,7 +282,7 @@ def send_talk_proposed_emails(proposal): 'talk': proposal.talk, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] Talk proposal for %s' % proposal.event.name + email_subject = 'Talk proposal for: %s' % proposal.event.name email_body_text = render_to_string('get_together/emails/events/talk_proposed.txt', context) email_body_html = render_to_string('get_together/emails/events/talk_proposed.html', context) email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') @@ -344,7 +344,7 @@ def send_talk_acceptance_emails(proposal, reviewer): 'reviewer': reviewer, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] About your talk proposal %s' % proposal.event.name + email_subject = 'About your talk proposal: %s' % proposal.event.name email_body_text = render_to_string('get_together/emails/events/talk_acceptance.txt', context) email_body_html = render_to_string('get_together/emails/events/talk_acceptance.html', context) email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') diff --git a/get_together/views/teams.py b/get_together/views/teams.py index 9f596cf..06262f1 100644 --- a/get_together/views/teams.py +++ b/get_together/views/teams.py @@ -250,7 +250,7 @@ def invite_member(email, team, sender): 'team': team, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] Invite to join %s' % team + email_subject = 'Invitation to join: %s' % team email_body_text = render_to_string('get_together/emails/teams/member_invite.txt', context) email_body_html = render_to_string('get_together/emails/teams/member_invite.html', context) email_recipients = [email] @@ -282,7 +282,7 @@ def contact_member(member, body, sender): 'body': body, 'site': Site.objects.get(id=1), } - email_subject = '[GetTogether] Message from %s' % member.team + email_subject = 'A message from: %s' % member.team email_body_text = render_to_string('get_together/emails/teams/member_contact.txt', context) email_body_html = render_to_string('get_together/emails/teams/member_contact.html', context) email_recipients = [member.user.user.email]