Merge pull request #530 from OpenTechFund/feature/170-e-mail-templates-changes

Minor fixes to e-mail templates. Comma efter Dear name, Space after s…

opentech/apply/activity/messaging.py

@@ -175,7 +175,7 @@ class SlackAdapter(AdapterBase):
     messages = {
         MESSAGES.NEW_SUBMISSION: 'A new submission has been submitted for {submission.page.title}: <{link}|{submission.title}>',
         MESSAGES.UPDATE_LEAD: 'The lead of <{link}|{submission.title}> has been updated from {old_lead} to {submission.lead} by {user}',
-        MESSAGES.COMMENT: 'A new comment has been posted on <{link}|{submission.title}>',
+        MESSAGES.COMMENT: 'A new {comment.visibility} comment has been posted on <{link}|{submission.title}> by {user}',
         MESSAGES.EDIT: '{user} has edited <{link}|{submission.title}>',
         MESSAGES.APPLICANT_EDIT: '{user} has edited <{link}|{submission.title}>',
         MESSAGES.REVIEWERS_UPDATED: '{user} has updated the reviewers on <{link}|{submission.title}>',

opentech/apply/activity/templates/messages/email/applicant_base.html

 {% extends "messages/email/base.html" %}
 {% block salutation %}Dear {{ submission.user.get_full_name|default:"applicant" }},{% endblock %}
 
-{% block more_info %}
-You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+{% block more_info %}You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
 
-If you have any questions, please leave a message on your application or email us at info@opentech.fund
-{% endblock %}
+If you have any questions, please leave a message on your application or email us at info@opentech.fund{% endblock %}

opentech/apply/activity/templates/messages/email/base.html

-{% block salutation %}Dear {{ user }}{% endblock %}
+{% block salutation %}Dear {{ user }},{% endblock %}
 
 {% block content %}{% endblock %}
 
@@ -7,8 +7,7 @@
 Kind Regards,
 The OTF Team
 
---
+-- 
 Open Technology Fund
 https://www.opentech.fund/
-
 {% block post_signature_content %}{% endblock %}

opentech/apply/activity/templates/messages/email/invited_to_proposal.html

 {% extends "messages/email/applicant_base.html" %}
 
-{% block content %}
-We’ve reviewed your Concept Note and think it could be a good fit for OTF funding. We would like to invite you to submit a Proposal with more details about your project.
+{% block content %}We’ve reviewed your Concept note and think it could be a good fit for OTF funding. We would like to invite you to submit a Proposal with more details about your project.
 
-You can find more information about what we’d like to see in your Proposal here: https://www.opentech.fund/apply/guide#sections
+You can find more information about what we’d like to see in your Proposal here: https://guide.opentech.fund/
 
-The system will allow you to save a draft of your Proposal as you work on it. When you feel it is ready for our review, please just “Submit” and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal shortly after you submit it.
-{% endblock %}
+The system will allow you to save a draft of your Proposal as you work on it. When you feel it is ready for our review, please click the “Submit” button and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal as quickly as possible.{% endblock %}

opentech/apply/funds/templates/funds/email/confirmation.html

 {% extends "messages/email/base.html" %}
 
-{% block content %}
-{% with email_context=submission.page.specific %}
-We appreciate your {{ email_context.title }} application submission to the Open Technology Fund. We will review and reply to your
-submission as quickly as possible. Our reply will have the next steps for your {{ email_context.title }} application.
-You can find more information about our support options, review process and selection criteria on our website.
+{% block content %}{% with email_context=submission.page.specific %}We appreciate your {{ email_context.title }} application submission to the Open Technology Fund. We will review and reply to your submission as quickly as possible.
 
-{{ email_context.confirmation_text_text }}
-{% endwith %}
+Our reply will have the next steps for your {{ email_context.title }} application. You can find more information about our support options, review process and selection criteria on our website.
+
+{{ email_context.confirmation_text_text }}{% endwith %}
 
 Project name: {{ submission.title }}
 Contact name: {{ submission.user.get_full_name }}
-Contact email: {{ submission.user.email }}
-{% endblock %}
+Contact email: {{ submission.user.email }}{% endblock %}

opentech/apply/funds/templates/funds/fund_type_landing.html

@@ -5,6 +5,8 @@
     <h3>Thank you for your submission to the Open Technology Fund.</h3>
     <div class="rich-text">
         <p>An e-mail with more information has been sent to the address you entered.</p>
+        <p>If you do not receive an e-mail within 15 minutes please check your
+spam folder and contact help@opentech.fund for further assistance.</p>
     </div>
 </div>
 {% endblock %}

opentech/apply/users/templates/users/activation/email.txt

@@ -2,7 +2,7 @@
 {% base_url_setting as base_url %}
 Dear {{ name|default:username }},
 
-An account on Open Technology Fund has been created. Activate your account by clicking this link or copying and pasting it to your browser:
+An account on the Open Technology Fund web site has been created. Activate your account by clicking this link or copying and pasting it to your browser:
 
 {% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{{ activation_path }}
 
@@ -16,6 +16,6 @@ password: Your chosen password
 Thanks,
 The OTF Team
 
---
+-- 
 Open Technology Fund
 https://www.opentech.fund/