From e06ecd7b136a4f7046368eb49ce2c0f3762f60b9 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 11 Sep 2018 11:36:55 +0200
Subject: [PATCH] Issue: #170 Minor fixes to e-mail templates. Comma efter Dear
name, Space after signature divider. Line break fixes.
---
opentech/apply/activity/templates/messages/email/base.html | 5 ++---
.../apply/funds/templates/funds/email/confirmation.html | 6 +++---
opentech/apply/users/templates/users/activation/email.txt | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opentech/apply/activity/templates/messages/email/base.html b/opentech/apply/activity/templates/messages/email/base.html
index 80cc2fbbe..b745bcf22 100644
--- a/opentech/apply/activity/templates/messages/email/base.html
+++ b/opentech/apply/activity/templates/messages/email/base.html
@@ -1,4 +1,4 @@
-{% 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 %}
diff --git a/opentech/apply/funds/templates/funds/email/confirmation.html b/opentech/apply/funds/templates/funds/email/confirmation.html
index f517b72a8..06fe0ef44 100644
--- a/opentech/apply/funds/templates/funds/email/confirmation.html
+++ b/opentech/apply/funds/templates/funds/email/confirmation.html
@@ -2,9 +2,9 @@
{% 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.
+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.
{{ email_context.confirmation_text_text }}
{% endwith %}
diff --git a/opentech/apply/users/templates/users/activation/email.txt b/opentech/apply/users/templates/users/activation/email.txt
index a32a55ca6..aebd8a8aa 100644
--- a/opentech/apply/users/templates/users/activation/email.txt
+++ b/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/
--
GitLab