added lines, updated email text

Author: naisnouk

mailer/event_report_mailer.py

@@ -14,11 +14,9 @@ def send_event_report_email (user, event):
 
 	txt_content = template.render(context)
 
-	send_mail('New event needs your attention', txt_content, "[email protected]", [user.email])
+	send_mail('A new event on codeweek.eu needs your attention', txt_content, "[email protected]", [user.email])
 
 def send_email_to_country_ambassadors(event):
 	ambassadors = get_ambassadors_for_country(event.country)
 	for user in ambassadors:
 		send_event_report_email(user, event)
-
-	

mailer/templates/mailer/event_email.txt

@@ -1,8 +1,7 @@
 Hello, {{user.first_name}}!
 
-New event {{ event.title }} has been added to the codeweek.eu site and it needs your revision. Could you be kind enough to check if everything is ok and approve it, otherwise request an update.
-
+A new event {{ event.title }} has been added to the codeweek.eu site and it needs your revision. Would you be kind enough to check if everything is ok and approve it, or otherwise request an update: http://events.codeweek.eu{% url 'web.view_event' event.id event.slug %}
 
 Thank you for your help!
 
-Codeweek.eu Team
+Codeweek.eu Team

mailer/tests.py

@@ -8,7 +8,6 @@
 
 from django.core import mail
 
-# Create your tests here.
 
 class EmailTestCase(TestCase):
 	def setUp(self):
@@ -34,7 +33,7 @@ def test_send_event_email(self):
 		send_event_report_email(self.u1, self.event)
 		email = mail.outbox[0]
 
-		self.assertEquals('New event needs your attention', email.subject)
+		self.assertEquals('A new event on codeweek.eu needs your attention', email.subject)
 		self.assertEquals('[email protected]', email.from_email)
 		self.assertEquals([self.u1.email], email.to)
 		self.assertIn(self.u1.first_name, email.body)

web/tests/test_user_processors.py

@@ -39,4 +39,3 @@ def test_get_ambassadors_for_country(self):
 
 		self.assertItemsEqual ([self.u1], get_ambassadors_for_country("SI"))
 		self.assertItemsEqual ([], get_ambassadors_for_country("FR"))
-