Skip to content

Set specific subjects for draft submissions and determination e-mails. #4990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frjo merged 3 commits into from
Sep 17, 2026
Merged

Set specific subjects for draft submissions and determination e-mails. #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13bd601
Set specific subjects for draft submissions and determination e-mails.
frjo Sep 17, 2026
0c143a5
Added context to blocktrans to remove xgettext warnings.
frjo Sep 17, 2026
740d670
Update locales.
frjo Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion hypha/apply/activity/adapters/emails.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hypha/apply/funds/templates/funds/includes/projects_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
</button>
<ul
Expand Down
2 changes: 1 addition & 1 deletion hypha/apply/projects/templates/application_projects/submission_projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% trans "Application" %}
</a>
<a class="tab tab-active" href="{% url 'funds:submissions:projects' pk=submission.id %}">
{% blocktrans count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
{% blocktrans context "project tab" count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
</a>
<a
class="tab [--color-base-content:var(--color-neutral-content)]"
Expand Down
Loading