# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1235671230 0
# Node ID 50fb3a9b66159c586206582ef54f142234c22358
# Parent  ea80be783971c9a9b3ae9e579b446c5fb487c538
Fix for Issue 218.

Basically just an update of the soc/gorup/messages/accepted.html template.

Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed

diff -r ea80be783971 -r 50fb3a9b6615 app/soc/logic/helper/notifications.py
--- a/app/soc/logic/helper/notifications.py	Thu Feb 26 17:36:46 2009 +0000
+++ b/app/soc/logic/helper/notifications.py	Thu Feb 26 18:00:30 2009 +0000
@@ -105,6 +105,8 @@
       }
 
   message_properties = {
+      'application_type': params['name'],
+      'group_type': params['group_name'],
       'group_name': entity.name,
       'url': url,
       }
diff -r ea80be783971 -r 50fb3a9b6615 app/soc/templates/soc/group/messages/accepted.html
--- a/app/soc/templates/soc/group/messages/accepted.html	Thu Feb 26 17:36:46 2009 +0000
+++ b/app/soc/templates/soc/group/messages/accepted.html	Thu Feb 26 18:00:30 2009 +0000
@@ -14,6 +14,6 @@
 {% endcomment %}
 
 {% block content %}
-Your club application for "{{ group_name }}" has been accepted.
-Please click <a href="{{ url }}">here</a> to fill in the necessary information and create your club.
+Your {{ application_type }} for "{{ group_name }}" has been accepted.
+Please click <a href="{{ url }}">here</a> to fill in the necessary information and create your {{ group_type }}.
 {% endblock %}
diff -r ea80be783971 -r 50fb3a9b6615 app/soc/views/models/club_app.py
--- a/app/soc/views/models/club_app.py	Thu Feb 26 17:36:46 2009 +0000
+++ b/app/soc/views/models/club_app.py	Thu Feb 26 18:00:30 2009 +0000
@@ -82,6 +82,7 @@
     new_params['name_plural'] = "Club Applications"
     new_params['name_short'] = "Club App"
     new_params['url_name'] = "club_app"
+    new_params['group_name'] = "Club"
     new_params['group_url_name'] = 'club'
 
     new_params['review_template'] = 'soc/club_app/review.html'
diff -r ea80be783971 -r 50fb3a9b6615 app/soc/views/models/org_app.py
--- a/app/soc/views/models/org_app.py	Thu Feb 26 17:36:46 2009 +0000
+++ b/app/soc/views/models/org_app.py	Thu Feb 26 18:00:30 2009 +0000
@@ -116,6 +116,7 @@
     new_params['name_plural'] = "Organization Applications"
     new_params['name_short'] = "Org App"
     new_params['url_name'] = "org_app"
+    new_params['group_name'] = "Organization"
     new_params['group_url_name'] = 'org'
 
     new_params['review_template'] = 'soc/org_app/review.html'