From 13bd6011623df66d3f6dd572caeb91c514afb41e Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Thu, 17 Sep 2026 13:09:28 +0200 Subject: [PATCH 1/3] Set specific subjects for draft submissions and determination e-mails. --- hypha/apply/activity/adapters/emails.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hypha/apply/activity/adapters/emails.py b/hypha/apply/activity/adapters/emails.py index e4bc3a4f51..7f2aff0371 100644 --- a/hypha/apply/activity/adapters/emails.py +++ b/hypha/apply/activity/adapters/emails.py @@ -146,13 +146,28 @@ def get_subject(self, message_type, source): source=source ) ) + elif message_type == MESSAGES.COMMENT: + subject = _( + "New comment on application to {ORG_LONG_NAME}: {source.title}" + ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source) + elif message_type in { + MESSAGES.DETERMINATION_OUTCOME, + MESSAGES.BATCH_DETERMINATION_OUTCOME, + }: + subject = _( + "Your application to {ORG_LONG_NAME} has been reviewed: {source.title_text_display}" + ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source) + elif message_type == MESSAGES.DRAFT_SUBMISSION: + subject = _( + "Draft saved – application to {ORG_LONG_NAME}: {source.title}" + ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source) else: try: subject = source.page.specific.subject or _( "Your application to {ORG_LONG_NAME}: {source.title_text_display}" ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source) except AttributeError: - subject = _("Your {ORG_LONG_NAME} Project: {source.title}").format( + subject = _("Your {ORG_LONG_NAME} project: {source.title}").format( ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source ) return subject From 0c143a583fe39e00b231cb682a65376c4c059665 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Thu, 17 Sep 2026 13:53:12 +0200 Subject: [PATCH 2/3] Added context to blocktrans to remove xgettext warnings. --- hypha/apply/funds/templates/funds/includes/projects_tab.html | 2 +- .../templates/application_projects/submission_projects.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hypha/apply/funds/templates/funds/includes/projects_tab.html b/hypha/apply/funds/templates/funds/includes/projects_tab.html index 9f73a5da42..6f7f102646 100644 --- a/hypha/apply/funds/templates/funds/includes/projects_tab.html +++ b/hypha/apply/funds/templates/funds/includes/projects_tab.html @@ -27,7 +27,7 @@ @keydown.escape="open = false" :aria-expanded="open" > - {% blocktrans count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %} + {% blocktrans context "project tab" count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %} {% heroicon_micro "chevron-down" aria_hidden="true" size=16 class="inline-block size-4" %}