diff --git a/hypha/apply/activity/templates/messages/email/applicant_base.html b/hypha/apply/activity/templates/messages/email/applicant_base.html
index fd8a4765f5b97bd90d20813009cece8f33a7be9c..c9af1677ca8be1c889153c3536a98bc80565cf2b 100644
--- a/hypha/apply/activity/templates/messages/email/applicant_base.html
+++ b/hypha/apply/activity/templates/messages/email/applicant_base.html
@@ -3,11 +3,9 @@
{% load i18n %}
{% block salutation %}{% blocktrans with name=source.user.get_full_name|default:"applicant" %}Dear {{ name }},{% endblocktrans %}{% endblock %}
-{% block more_info %}
-{% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+{% block more_info %}{% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
{% trans "Link to our guide" %}: {{ ORG_GUIDE_URL }}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
-{% endblock %}
+{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/base.html b/hypha/apply/activity/templates/messages/email/base.html
index 84fa974aec1298033ec3da11634b605fb43fc969..07f42af0d36839c3d65e24d0bfa5df9a5a1bec2e 100644
--- a/hypha/apply/activity/templates/messages/email/base.html
+++ b/hypha/apply/activity/templates/messages/email/base.html
@@ -1,13 +1,14 @@
{% load i18n %}
{% block salutation %}{% blocktrans %}Dear {{ user }},{% endblocktrans %}{% endblock %}
-{% load i18n %}
{% block content %}{% endblock %}
+
{% block more_info %}{% endblock %}
+
{% blocktrans %}Kind Regards,
-The {{ ORG_SHORT_NAME }} Team
+The {{ ORG_SHORT_NAME }} Team{% endblocktrans %}
--
{{ ORG_LONG_NAME }}
-{{ PUBLIC_SITE.root_url }}{% endblocktrans %}
+{{ PUBLIC_SITE.root_url }}
{% block post_signature_content %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/invited_to_proposal.html b/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
index 778ab5d7c998c3aeea77e5c958fc50a6e187b185..ad96fe3686348e8840f0e71830973069d9958428 100644
--- a/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
+++ b/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
@@ -5,11 +5,9 @@
{% blocktrans %}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.{% endblocktrans %}{% endblock %}
-{% block more_info %}
-{% trans "Here is the link to start creating your proposal" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+{% block more_info %}{% trans "Here is the link to start creating your proposal" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
{% trans "Link to our guide" %}: {{ ORG_GUIDE_URL }}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
-{% endblock %}
+{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/email/confirmation.html b/hypha/apply/funds/templates/funds/email/confirmation.html
index f93667ffd14116ddd5e36f384ad258b4d2bf48e7..f6d71f928f86d9f9d2042915f5eb89b982537cbb 100644
--- a/hypha/apply/funds/templates/funds/email/confirmation.html
+++ b/hypha/apply/funds/templates/funds/email/confirmation.html
@@ -1,12 +1,12 @@
{% extends "messages/email/base.html" %}
{% load i18n %}
-{% block content %}{% blocktrans with title=source.page.specific.title %}We appreciate your {{ title }} application submission to the {{ ORG_LONG_NAME }}. We will review and reply to your submission as quickly as possible.
+{% block content %}{% blocktrans with title=source.title %}We appreciate your {{ title }} application submission to the {{ ORG_LONG_NAME }}. We will review and reply to your submission as quickly as possible.
Our reply will have the next steps for your {{ title }} application. You can find more information about our support options, review process and selection criteria on our website.{% endblocktrans %}
{% with email_context=source.page.specific %}{{ email_context.confirmation_text_extra }}{% endwith %}
-{% trans "Project name" %}: {{ title }}
+{% trans "Project name" %}: {{ source.title }}
{% trans "Contact name" %}: {{ source.user.get_full_name }}
{% trans "Contact email" %}: {{ source.user.email }}{% endblock %}
diff --git a/hypha/apply/users/templates/users/activation/email.txt b/hypha/apply/users/templates/users/activation/email.txt
index 69a869192dea18efda070d3763371bb6c599ffa9..acb456d2e0ca79258d92e8995dda6d0118a298e5 100644
--- a/hypha/apply/users/templates/users/activation/email.txt
+++ b/hypha/apply/users/templates/users/activation/email.txt
@@ -1,10 +1,7 @@
-{% load i18n wagtailadmin_tags %}
-{% base_url_setting as base_url %}
-{% firstof name username as user %}
-
+{% load i18n wagtailadmin_tags %}{% base_url_setting as base_url %}{% firstof name username as user %}
{% blocktrans %}Dear {{ user }},{% endblocktrans %}
-{% blocktrans %}An account on the {{ ORG_LONG_NAME }} web site has been created. Activate your account by clicking this link or copying and pasting it to your browser:{% endblocktrans %}
+{% blocktrans %}An account on the {{ org_long_name }} web site has been created. Activate your account by clicking this link or copying and pasting it to your browser:{% endblocktrans %}
{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{{ activation_path }}
@@ -15,11 +12,11 @@
{% trans "Username" %}: {{ username }}
{% trans "Password" %}: {% trans "Your chosen password" %}
-{% blocktrans with root_url=site.root_url %}If you do not complete the activation process within {{ timeout_days }} days you can use the password reset form at{% endblocktrans %}: {% if site %}{{ root_url }}{% else %}{{ base_url }}{% endif %}{% url 'users:password_reset' %}
+{% blocktrans %}If you do not complete the activation process within {{ timeout_days }} days you can use the password reset form at{% endblocktrans %}: {% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{% url 'users:password_reset' %}
-{% blocktrans with root_url=PUBLIC_SITE.root_url %}Kind Regards,
-The {{ ORG_SHORT_NAME }} Team
+{% blocktrans %}Kind Regards,
+The {{ org_short_name }} Team{% endblocktrans %}
--
-{{ ORG_LONG_NAME }}
-{{ root_url }}{% endblocktrans %}
+{{ org_long_name }}
+{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}
diff --git a/hypha/apply/users/templates/users/email_change/confirm_email.txt b/hypha/apply/users/templates/users/email_change/confirm_email.txt
index c62efe9c12b4adb34704fea7846db54df6ce160d..f5625233ffff3952ac9b5038a51c946e275a4196 100644
--- a/hypha/apply/users/templates/users/email_change/confirm_email.txt
+++ b/hypha/apply/users/templates/users/email_change/confirm_email.txt
@@ -1,19 +1,15 @@
-{% load i18n wagtailadmin_tags %}
-{% base_url_setting as base_url %}
-{% firstof name username as user %}
-
+{% load i18n wagtailadmin_tags %}{% base_url_setting as base_url %}{% firstof name username as user %}
{% blocktrans %}Dear {{ user }},{% endblocktrans %}
-{% blocktrans %}Request to change email of your account on the {{ ORG_LONG_NAME }} web site has been accepted. Confirm your email by clicking this link or copying and pasting it to your browser:{% endblocktrans %}
+{% blocktrans %}Request to change email of your account on the {{ org_long_name }} web site has been accepted. Confirm your email by clicking this link or copying and pasting it to your browser:{% endblocktrans %}
{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{{ activation_path }}
{% blocktrans %}This link will only remain active for {{ timeout_days }} days and will lead you to profile page after verification.{% endblocktrans %}
-
-{% blocktrans with root_url=PUBLIC_SITE.root_url %}Kind Regards,
-The {{ ORG_SHORT_NAME }} Team
+{% blocktrans %}Kind Regards,
+The {{ org_short_name }} Team{% endblocktrans %}
--
-{{ ORG_LONG_NAME }}
-{{ root_url }}{% endblocktrans %}
+{{ org_long_name }}
+{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}
diff --git a/hypha/apply/users/templates/users/password_reset/email.txt b/hypha/apply/users/templates/users/password_reset/email.txt
index ba51754de39bd3626c4305932b718256f87a4e07..2cfbdd19e89ec9120a8d1ed39fa9fdc1618ccf20 100644
--- a/hypha/apply/users/templates/users/password_reset/email.txt
+++ b/hypha/apply/users/templates/users/password_reset/email.txt
@@ -1,5 +1,6 @@
-{% load i18n wagtailadmin_tags %}{% base_url_setting as base_url %}
+{% load i18n wagtailadmin_tags %}
{% trans "Please follow the link below to reset your password:" %}
+
{{ protocol }}://{{ domain }}{% url 'users:password_reset_confirm' uidb64=uid token=token %}
{% if user.USERNAME_FIELD != "email" %}
diff --git a/hypha/apply/users/utils.py b/hypha/apply/users/utils.py
index 6814b47176771faf8bd3f7b564519b509a35b16e..0fc69fd8604519ee7218182c6f992b383f683256 100644
--- a/hypha/apply/users/utils.py
+++ b/hypha/apply/users/utils.py
@@ -43,6 +43,7 @@ def send_activation_email(user, site=None):
'activation_path': activation_path,
'timeout_days': timeout_days,
'org_long_name': settings.ORG_LONG_NAME,
+ 'org_short_name': settings.ORG_SHORT_NAME,
}
if site:
@@ -75,6 +76,7 @@ def send_confirmation_email(user, token, updated_email=None, site=None):
'activation_path': activation_path,
'timeout_days': timeout_days,
'org_long_name': settings.ORG_LONG_NAME,
+ 'org_short_name': settings.ORG_SHORT_NAME,
}
if site:
diff --git a/hypha/public/utils/context_processors.py b/hypha/public/utils/context_processors.py
index 8f86e839a0e9cea6cb7c4ad02289f4e43149c6f3..a99ee6e3f126dda0f9c2543421d374f3cea51031 100644
--- a/hypha/public/utils/context_processors.py
+++ b/hypha/public/utils/context_processors.py
@@ -14,6 +14,7 @@ def global_vars(request):
'ORG_LONG_NAME': settings.ORG_LONG_NAME,
'ORG_SHORT_NAME': settings.ORG_SHORT_NAME,
'ORG_EMAIL': settings.ORG_EMAIL,
+ 'ORG_GUIDE_URL': settings.ORG_GUIDE_URL,
'MATOMO_URL': settings.MATOMO_URL,
'MATOMO_SITEID': settings.MATOMO_SITEID,
'CURRENCY_SYMBOL': settings.CURRENCY_SYMBOL,