# HG changeset patch # User Pawel Solyga # Date 1237308890 0 # Node ID 0d37e9797a903895b9f4763366a21e1f675f3438 # Parent 87c3e62b28dc1cc607b6bdcd583c2c9f80a1187f Add organization name to organization application acceptance/rejection email templates. Patch by: Pawel Solyga Reviewed by: to-be-reviewed diff -r 87c3e62b28dc -r 0d37e9797a90 app/soc/templates/soc/org_app/mail/accepted.html --- a/app/soc/templates/soc/org_app/mail/accepted.html Tue Mar 17 13:28:06 2009 +0000 +++ b/app/soc/templates/soc/org_app/mail/accepted.html Tue Mar 17 16:54:50 2009 +0000 @@ -15,7 +15,7 @@ {% block content %}

- Your organization application for {{ program_name }} has been + Your "{{ org_app_name }}" organization application for {{ program_name }} has been accepted. Please take a moment *now* to log in to {{ HTTP_host }} and review your Notifications (accessible in the left hand navigation menu). You will need to follow the instructions diff -r 87c3e62b28dc -r 0d37e9797a90 app/soc/templates/soc/org_app/mail/accepted_gsoc2009.html --- a/app/soc/templates/soc/org_app/mail/accepted_gsoc2009.html Tue Mar 17 13:28:06 2009 +0000 +++ b/app/soc/templates/soc/org_app/mail/accepted_gsoc2009.html Tue Mar 17 16:54:50 2009 +0000 @@ -15,7 +15,7 @@ {% block content %}

- Your organization application for {{ program_name }} has been + Your "{{ org_app_name }}" organization application for {{ program_name }} has been accepted. Please take a moment *now* to log in to {{ HTTP_host }} and review your Notifications (accessible in the left hand navigation menu). You will need to follow the instructions diff -r 87c3e62b28dc -r 0d37e9797a90 app/soc/templates/soc/org_app/mail/rejected.html --- a/app/soc/templates/soc/org_app/mail/rejected.html Tue Mar 17 13:28:06 2009 +0000 +++ b/app/soc/templates/soc/org_app/mail/rejected.html Tue Mar 17 16:54:50 2009 +0000 @@ -14,8 +14,8 @@ {% endcomment %} {% block content %} -Thank you for submitting an application as a mentoring organization for {{ program_name }}. -Unfortunately, we were not able to accept your organization's application at this time. +Thank you for submitting "{{ org_app_name }}" organization application to {{ program_name }}. +Unfortunately, we were unable to accept your organization's application at this time. We received many more applications for the program than we are able to accommodate, and we would encourage you to reapply for future instances of the program. {% endblock %} diff -r 87c3e62b28dc -r 0d37e9797a90 app/soc/views/models/org_app.py --- a/app/soc/views/models/org_app.py Tue Mar 17 13:28:06 2009 +0000 +++ b/app/soc/views/models/org_app.py Tue Mar 17 16:54:50 2009 +0000 @@ -225,7 +225,8 @@ 'to': to, 'sender_name': sender_name, 'to_name': user_entity.name, - 'program_name': app_entity.scope.name} + 'program_name': app_entity.scope.name + 'org_app_name': app_entity.name} if status == 'accepted': # use the accepted template and subject