From be33097b762a33d49f9d3b53f673c54013ffad9b Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Thu, 21 Mar 2024 10:08:44 +0100
Subject: [PATCH] Fix untranslateble strings. (#3809)
Fixes #3784
---
.github/PULL_REQUEST_TEMPLATE.md | 5 +--
hypha/apply/activity/models.py | 4 +-
.../templates/activity/notifications.html | 2 +-
.../dashboard/applicant_dashboard.html | 2 +-
.../dashboard/contracting_dashboard.html | 2 +-
.../templates/dashboard/dashboard.html | 2 +-
.../dashboard/finance_dashboard.html | 2 +-
.../funds/applicationsubmission_detail.html | 2 +-
.../funds/includes/reminders_block.html | 2 +-
.../funds/includes/submission-list-item.html | 2 +-
.../includes/table_filter_and_search.html | 2 +-
.../funds/templates/submissions/all.html | 40 +++++++++----------
.../templates/submissions/submenu/rounds.html | 4 +-
hypha/apply/projects/forms/payment.py | 6 ++-
hypha/apply/projects/forms/project.py | 2 +-
hypha/apply/projects/forms/report.py | 2 +-
hypha/apply/projects/forms/vendor.py | 2 +-
.../includes/contracting_documents.html | 2 +-
.../includes/deliverables_block.html | 2 +-
.../includes/supporting_documents.html | 4 +-
.../application_projects/invoice_detail.html | 4 +-
.../application_projects/paf_export.html | 12 +++---
.../application_projects/project_detail.html | 4 +-
.../application_projects/sow_export.html | 4 +-
hypha/apply/projects/views/project.py | 2 +-
.../apply/projects/views/project_partials.py | 5 ++-
hypha/apply/projects/views/vendor.py | 2 +-
hypha/apply/users/templates/users/login.html | 8 ++--
.../passwordless_login_signup_sent.html | 2 +-
.../users/password_reset/confirm.html | 4 +-
.../users/passwordless_login_signup.html | 10 ++++-
.../apply/users/templates/users/register.html | 2 +-
.../templates/wagtailusers/users/index.html | 2 +-
.../templates/components/dropdown-menu.html | 6 +--
hypha/templates/base-apply.html | 12 +++---
hypha/templates/includes/messages.html | 4 +-
36 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ed4b7571d..fba93f977 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,11 +4,10 @@ Thanks for contributing to Hypha!
Please ensure your contributions pass all necessary linting/testing and that the appropriate documentation has been updated.
-->
-## Description
<!--
Describe briefly what your pull request changes. If this is resoving an issue, please specify below via "Fixes #<Github Issue ID>"
-->
-Fixes #ISSUEID.
+Fixes #ISSUEID
## Test Steps
@@ -21,4 +20,4 @@ Give a brief overview of the steps required for a user/dev to test this contribu
- Langauge that can be understood by non-technical testers if being tested by users
-->
- - [ ] ...
+ - [ ] …
diff --git a/hypha/apply/activity/models.py b/hypha/apply/activity/models.py
index a94ddd3c6..d0fe8c36b 100644
--- a/hypha/apply/activity/models.py
+++ b/hypha/apply/activity/models.py
@@ -21,8 +21,8 @@ COMMENT = "comment"
ACTION = "action"
ACTIVITY_TYPES = {
- COMMENT: "Comment",
- ACTION: "Action",
+ COMMENT: _("Comment"),
+ ACTION: _("Action"),
}
# Visibility strings. Used to determine visibility states but are also
diff --git a/hypha/apply/activity/templates/activity/notifications.html b/hypha/apply/activity/templates/activity/notifications.html
index 130b90d03..83d511ac9 100644
--- a/hypha/apply/activity/templates/activity/notifications.html
+++ b/hypha/apply/activity/templates/activity/notifications.html
@@ -71,7 +71,7 @@
{% if activity.related_object %}
<p>
<a href="{{ activity.related_object.get_absolute_url }}" class="uppercase font-bold hover:opacity-70 transition-opacity">
- <span>View {{ activity.related_object|model_verbose_name }}</span>
+ <span>{% trans "View" %} {{ activity.related_object|model_verbose_name }}</span>
{% heroicon_outline "arrow-right" size=12 class="inline align-baseline" stroke_width=4 %}
</a>
</p>
diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 9a813a591..9ae7a0b1e 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -32,7 +32,7 @@
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
- <a class="button button-primary m-2" href="{{ task.url }}">View</a>
+ <a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
diff --git a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
index 2054d55a8..70ed5fce2 100644
--- a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
@@ -22,7 +22,7 @@
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
- <a class="button button-primary m-2" href="{{ task.url }}">View</a>
+ <a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
diff --git a/hypha/apply/dashboard/templates/dashboard/dashboard.html b/hypha/apply/dashboard/templates/dashboard/dashboard.html
index 416674592..be41c4c61 100644
--- a/hypha/apply/dashboard/templates/dashboard/dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/dashboard.html
@@ -31,7 +31,7 @@
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
- <a class="button button-primary m-2" href="{{ task.url }}">View</a>
+ <a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index 6320843ea..dfc2298d3 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -22,7 +22,7 @@
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
- <a class="button button-primary m-2" href="{{ task.url }}">View</a>
+ <a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
index 72e2d02a1..59d3c9314 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -203,7 +203,7 @@
<div class="tabs__content" id="tab-3">
<div class="feed">
{% comment %} Loaded using the htmx via alpine's custom event "open-tab-3"{% endcomment %}
- <p>Loading...</p>
+ <p>{% trans "Loading…" %}</p>
</div>
</div>
</div>
diff --git a/hypha/apply/funds/templates/funds/includes/reminders_block.html b/hypha/apply/funds/templates/funds/includes/reminders_block.html
index a28b84727..96a2e5023 100644
--- a/hypha/apply/funds/templates/funds/includes/reminders_block.html
+++ b/hypha/apply/funds/templates/funds/includes/reminders_block.html
@@ -17,7 +17,7 @@
</div>
<a class="link reminder-delete" href="{% url 'funds:submissions:reminders:delete' object.id reminder.id %}">
{% heroicon_micro "trash" class="inline me-1 align-middle fill-red-500" aria_hidden=true %}
- <span class="sr-only">Delete</span>
+ <span class="sr-only">{% trans "Delete" %}</span>
</a>
</li>
{% endfor %}
diff --git a/hypha/apply/funds/templates/funds/includes/submission-list-item.html b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
index 3f983a9fd..65e947509 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-list-item.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
@@ -12,7 +12,7 @@
name="selectedSubmissionIds"
class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"
>
- <span class="sr-only">Select submission #{{ s.id }}</span>
+ <span class="sr-only">{% trans "Select submission" %} #{{ s.id }}</span>
</label>
{% comment %} Screening, and Archived icons {% endcomment %}
diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
index cfe337327..f837c4bfe 100644
--- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
+++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -86,7 +86,7 @@
{% if use_search|default:False %}
<form action="{{ search_action }}" method="get" role="search" class="form form--search-desktop">
<button class="button button--search" type="submit">
- <span class="sr-only">Search</span>
+ <span class="sr-only">{% trans "Search" %}</span>
{% heroicon_mini "magnifying-glass" size=20 class="text-fg-muted" aria_hidden=true %}
</button>
{% if show_archive and archived_param is not None %}
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index 412f93e1c..6d36bd2c0 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -73,7 +73,7 @@
type="search"
id="search-navbar"
class="block w-full p-2 ps-10 text-sm text-gray-900 border border-gray-300 rounded-sm bg-gray-50 focus:ring-blue-500 focus:border-blue-500"
- placeholder="Search..."
+ placeholder="{% trans "Search…" %}"
name="query"
hx-trigger="search"
hx-push-url="true"
@@ -81,7 +81,7 @@
hx-include="input.js-filter-options:not([name=query])"
hx-target="#main"
hx-swap="outerHTML"
- aria-label="{% trans 'Search Submissions' %}"
+ aria-label="{% trans 'Search submissions' %}"
value="{{ search_query|default_if_none:'' }}" {% if search_query %}autofocus{% endif %}
>
</label>
@@ -102,7 +102,7 @@
<div
class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
</div>
- <span class="ms-3 text-sm font-medium text-gray-600">Archived</span>
+ <span class="ms-3 text-sm font-medium text-gray-600">{% trans "Archived" %}</span>
</label>
</span>
{% endif %}
@@ -123,7 +123,7 @@
class="inline-flex items-center px-2 py-1 me-2 text-xs font-medium text-blue-400 bg-blue-100 rounded hover:bg-blue-200 hover:text-blue-900"
>
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove all filters</span>
+ <span class="sr-only">{% trans "Remove all filters" %}</span>
</a>
{% if selected_statuses %}
@@ -131,7 +131,7 @@
status:{% for s in selected_statuses %}{{ s }}{% endfor %}
<a href="{% remove_from_query "status" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Status Filter</span>
+ <span class="sr-only">{% trans "Remove status filter" %}</span>
</a>
</span>
{% endif %}
@@ -140,7 +140,7 @@
fund:{% for s in selected_fund_objects %}"{{ s }}"{% endfor %}
<a href="{% remove_from_query "fund" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Fund Filter</span>
+ <span class="sr-only">{% trans "Remove fund filter" %}</span>
</a>
</span>
{% endif %}
@@ -149,7 +149,7 @@
round:{% for s in selected_round_objects %}"{{ s }}"{% endfor %}
<a href="{% remove_from_query "round" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Round Filter</span>
+ <span class="sr-only">{% trans "Remove round filter" %}</span>
</a>
</span>
{% endif %}
@@ -158,7 +158,7 @@
Lead:{% for s in selected_leads %}{{ s }}{% endfor %}
<a href="{% remove_from_query "lead" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Leads Filter</span>
+ <span class="sr-only">{% trans "Remove leads filter" %}</span>
</a>
</span>
{% endif %}
@@ -167,7 +167,7 @@
Applicant:{% for s in selected_applicants %}{{ s }}{% endfor %}
<a href="{% remove_from_query "applicants" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Applicant Filter</span>
+ <span class="sr-only">{% trans "Remove applicant filter" %}</span>
</a>
</span>
{% endif %}
@@ -176,7 +176,7 @@
Reviewer:{{ s }}
<a href="{% remove_from_query reviewers=s %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Reviewer filter</span>
+ <span class="sr-only">{% trans "Remove reviewer filter" %}</span>
</a>
</span>
{% endfor %}
@@ -185,7 +185,7 @@
Meta Term:{{ s }}
<a href="{% remove_from_query meta_terms=s %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Meta Term filter</span>
+ <span class="sr-only">{% trans "Remove meta term filter" %}</span>
</a>
</span>
{% endfor %}
@@ -194,7 +194,7 @@
Category:{{ s.value }}
<a href="{% remove_from_query category_options=s.id %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove category filter</span>
+ <span class="sr-only">{% trans "Remove category filter" %}</span>
</a>
</span>
{% endfor %}
@@ -203,7 +203,7 @@
screening:"{{ s.title }}"
<a href="{% remove_from_query screening_statuses=s.slug %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove screening decisions filter</span>
+ <span class="sr-only">{% trans "Remove screening decisions filter" %}</span>
</a>
</span>
{% endfor %}
@@ -212,7 +212,7 @@
sort:{{ selected_sort }}
<a href="{% remove_from_query "sort" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
{% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
- <span class="sr-only">Remove Sort filter</span>
+ <span class="sr-only">{% trans "Remove sort filter" %}</span>
</a>
</span>
{% endif %}
@@ -276,7 +276,7 @@
<label
for="id_select_all"
x-show="!showSelectedSubmissions"
- class="ms-2">Select all</label>
+ class="ms-2">{% trans "Select all" %}</label>
<span x-cloak class="ms-2" x-show="showSelectedSubmissions"> <span x-text="selectedSubmissionCount"></span> selected</span>
</span>
@@ -463,8 +463,8 @@
{% include "funds/includes/submission-list-item.html" with s=s %}
{% empty %}
<div class="flex flex-col items-center justify-center py-20 px-4 border-t">
- <h2 class='text-2xl'>No results matched your search</h2>
- <p>Try <a href="./" hx-get="./" hx-target="#main" hx-push-url="true" hx-swap="outerHTML">clearing</a> the current query and try again.</p>
+ <h2 class='text-2xl'>{% trans "No results matched your search" %}</h2>
+ <p>{% trans "Try" %} <a href="./" hx-get="./" hx-target="#main" hx-push-url="true" hx-swap="outerHTML">{% trans "clearing" %}</a> {% trans "the current query and try again" %}.</p>
</div>
{% endfor %}
</section>
@@ -473,7 +473,7 @@
<span class="step-links flex gap-2 justify-center items-center">
{% if page.has_previous %}
<a href="?page=1" class="px-3 py-2 border hover:bg-slate-300">« First</a>
- <a href="?page={{ page.previous_page_number }}" class="px-3 py-2 border hover:bg-slate-300">Previous</a>
+ <a href="?page={{ page.previous_page_number }}" class="px-3 py-2 border hover:bg-slate-300">{% trans "Previous" %}</a>
{% endif %}
<span class="current">
@@ -481,8 +481,8 @@
</span>
{% if page.has_next %}
- <a href="?page={{ page.next_page_number }}" class="px-3 py-2 border hover:bg-slate-300">Next</a>
- <a href="?page={{ page.paginator.num_pages }}" class="px-3 py-2 border hover:bg-slate-300">Last »</a>
+ <a href="?page={{ page.next_page_number }}" class="px-3 py-2 border hover:bg-slate-300">{% trans "Next" %}</a>
+ <a href="?page={{ page.paginator.num_pages }}" class="px-3 py-2 border hover:bg-slate-300">{% trans "Last" %} »</a>
{% endif %}
</span>
</nav>
diff --git a/hypha/apply/funds/templates/submissions/submenu/rounds.html b/hypha/apply/funds/templates/submissions/submenu/rounds.html
index cf6fa245b..acf20af3c 100644
--- a/hypha/apply/funds/templates/submissions/submenu/rounds.html
+++ b/hypha/apply/funds/templates/submissions/submenu/rounds.html
@@ -25,14 +25,14 @@
<span @click="tab = 'closed_rounds'"
role="tab"
:class="{ 'border-x border-t border-b-transparent': tab === 'closed_rounds' }"
- class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg cursor-pointer hover:text-gray-900">Closed</span>
+ class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg cursor-pointer hover:text-gray-900">{% trans "Closed" %}</span>
{% endif %}
{% if open_rounds %}
<span @click="tab = 'open_rounds'"
role="tab"
:class="{ 'border-x border-t border-b-transparent': tab === 'open_rounds' }"
- class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg round cursor-pointer hover:text-gray-900">Open</span>
+ class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg round cursor-pointer hover:text-gray-900">{% trans "Open" %}</span>
{% endif %}
</nav>
diff --git a/hypha/apply/projects/forms/payment.py b/hypha/apply/projects/forms/payment.py
index 8379e92de..a68c9978f 100644
--- a/hypha/apply/projects/forms/payment.py
+++ b/hypha/apply/projects/forms/payment.py
@@ -104,7 +104,9 @@ class InvoiceBaseForm(forms.ModelForm):
class CreateInvoiceForm(FileFormMixin, InvoiceBaseForm):
document = SingleFileField(
- label="Invoice File", required=True, help_text=_("The invoice must be a PDF.")
+ label=_("Invoice file"),
+ required=True,
+ help_text=_("The invoice must be a PDF."),
)
supporting_documents = MultiFileField(
required=False,
@@ -169,7 +171,7 @@ class EditInvoiceForm(FileFormMixin, InvoiceBaseForm):
class SelectDocumentForm(forms.ModelForm):
document = forms.ChoiceField(
- label="Document", widget=forms.Select(attrs={"id": "from_submission"})
+ label=_("Document"), widget=forms.Select(attrs={"id": "from_submission"})
)
class Meta:
diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 93ffb6be5..b341b31be 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -183,7 +183,7 @@ class ProjectSOWForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMetaClass):
class ChangePAFStatusForm(forms.ModelForm):
name_prefix = "change_paf_status_form"
paf_status = forms.ChoiceField(
- label="PAF status", choices=PAF_STATUS_CHOICES, widget=forms.RadioSelect()
+ label=_("PAF status"), choices=PAF_STATUS_CHOICES, widget=forms.RadioSelect()
)
comment = forms.CharField(required=False, widget=forms.Textarea)
diff --git a/hypha/apply/projects/forms/report.py b/hypha/apply/projects/forms/report.py
index 1a4d2c7f9..917ae5824 100644
--- a/hypha/apply/projects/forms/report.py
+++ b/hypha/apply/projects/forms/report.py
@@ -23,7 +23,7 @@ class ReportEditForm(FileFormMixin, forms.ModelForm):
widget=forms.CheckboxSelectMultiple(attrs={"class": "delete"}),
queryset=ReportPrivateFiles.objects.all(),
required=False,
- label="Files",
+ label=_("Files"),
)
files = MultiFileField(required=False, label="")
diff --git a/hypha/apply/projects/forms/vendor.py b/hypha/apply/projects/forms/vendor.py
index e3792d2f4..a6f12a56e 100644
--- a/hypha/apply/projects/forms/vendor.py
+++ b/hypha/apply/projects/forms/vendor.py
@@ -66,7 +66,7 @@ class CreateVendorFormStep1(BaseVendorForm, forms.Form):
class CreateVendorFormStep2(BaseVendorForm, forms.Form):
required_to_pay_taxes = forms.TypedChoiceField(
- choices=((False, "No"), (True, "Yes")),
+ choices=((False, _("No")), (True, _("Yes"))),
coerce=lambda x: x == "True",
widget=forms.RadioSelect,
required=True,
diff --git a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
index 34fd7df57..0731c0c91 100644
--- a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
+++ b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
@@ -12,7 +12,7 @@
<button class="align-middle ms-1 transform transition-transform" x-bind:class="collapsed ? '': '-rotate-90' ">
{% heroicon_outline 'chevron-left' size=20 stroke_width=2 aria_hidden=true %}
- <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">expand</span>
+ <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">{% trans "expand" %}</span>
</button>
{% endif %}
</div>
diff --git a/hypha/apply/projects/templates/application_projects/includes/deliverables_block.html b/hypha/apply/projects/templates/application_projects/includes/deliverables_block.html
index acb4a7042..9fd559934 100644
--- a/hypha/apply/projects/templates/application_projects/includes/deliverables_block.html
+++ b/hypha/apply/projects/templates/application_projects/includes/deliverables_block.html
@@ -37,7 +37,7 @@
</div>
{% if invoice.deliverables_total_amount.total %}
<div class="total">
- <b>...</b><br>
+ <b>…</b><br>
<b>{% trans "Total:" %} {{ invoice.deliverables_total_amount.total|format_number_as_currency }}</b>
</div>
{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html b/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
index d56a3d884..a8613421c 100644
--- a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
+++ b/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
@@ -12,7 +12,7 @@
{% if collapsible_header %}
<button class="align-middle ms-1 transform transition-transform" x-bind:class="collapsed ? '': '-rotate-90' ">
{% heroicon_outline 'chevron-left' size=20 stroke_width=2 aria_hidden=true %}
- <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">expand</span>
+ <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">{% trans "expand" %}</span>
</button>
{% endif %}
</div>
@@ -281,7 +281,7 @@
<p>{% trans "By default all the members are notified when an approver is not selected. Optionally, you may select specific approvers to assign and notify them." %}</p>
<div class="flex items-center text-sm">
- <p class="flex-shrink font-bold text-slate-500 pe-2 mb-0">Optional</p>
+ <p class="flex-shrink font-bold text-slate-500 pe-2 mb-0">{% trans "Optional" %}</p>
<p class="flex-grow h-px bg-mid-grey mb-0"></p>
</div>
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
index 8fde3b012..f939f73f8 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -37,7 +37,7 @@
<span class="text-gray-400">{{ latest_activity.timestamp }}</span>
{% if latest_activity_comment %}
<svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
- <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">View comment</a>
+ <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
{% endif %}
</p>
{% for activity in activities %}
@@ -47,7 +47,7 @@
<span class="text-gray-400">{{ activity.timestamp }}</span>
{% if activity_comment %}
<svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
- <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">View comment</a>
+ <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
{% endif %}
</p>
{% endfor %}
diff --git a/hypha/apply/projects/templates/application_projects/paf_export.html b/hypha/apply/projects/templates/application_projects/paf_export.html
index c5b3c55c1..62b9a044a 100644
--- a/hypha/apply/projects/templates/application_projects/paf_export.html
+++ b/hypha/apply/projects/templates/application_projects/paf_export.html
@@ -1,3 +1,5 @@
+{% load i18n %}
+
<html>
<head>
<title>{{ title|default:"" }}</title>
@@ -70,7 +72,7 @@
<p class="title"> <b>{{ org_name|upper }}</b> PROJECT APPROVAL FORM</p>
</td>
<td align="right" class="align-right">
- <b>Project Title</b>
+ <b>{% trans "Project title" %}</b>
</td>
</tr>
<tr>
@@ -80,7 +82,7 @@
</tr>
<tr>
<td align="right" class="align-right">
- <b>Project ID</b>
+ <b>{% trans "Project ID" %}</b>
</td>
</tr>
<tr>
@@ -111,7 +113,7 @@
<p>-</p>
{% endif %}
<!-- Supporting Documents with links-->
- <p> <b>Supporting Documents </b></p>
+ <p> <b>{% trans "Supporting Documents" %}</b></p>
{% if supporting_documents %}
{% for document, document_link in supporting_documents.items %}
<p><a href="{{ document_link }}">{{ document }}</a></p>
@@ -120,7 +122,7 @@
<p>-</p>
{% endif %}
<!-- Submission title with link-->
- <p><b>Submission</b></p>
+ <p><b>{% trans "Submission" %}</b></p>
<p><a href="{{ submission_link }}">{{ submission }}</a></p>
{%endblock%}
@@ -131,7 +133,7 @@
{%block page_foot%}
<table>
<tr>
- <td>Exported by {{ export_user }} on {{ export_date }}</td>
+ <td>{% blocktrans %}Exported by {{ export_user }} on {{ export_date }}{% endblocktrans %}</td>
<td align="right">
Page: <pdf:pagenumber />
</td>
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
index 125783eef..ec2ae135d 100644
--- a/hypha/apply/projects/templates/application_projects/project_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -198,7 +198,7 @@
<p class="sidebar__paf-approvals--approved m-0">{% trans "Request changes or more information by " %}{{ paf_approval.user }}</p>
{% get_comment_for_requested_approval paf_approval as rejected_comment %}
{% if rejected_comment %}
- <a href="#communications#{{ rejected_comment.id }}" class="font-bold" target="_blank">View comment</a>
+ <a href="#communications#{{ rejected_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
{% endif %}
</div>
</div>
@@ -236,7 +236,7 @@
<div class="tabs__content" id="tab-3">
<div class="feed">
{% comment %} Loaded using the htmx via alpine's custom event "open-tab-3"{% endcomment %}
- <p>Loading...</p>
+ <p>{% trans "Loading…" %}</p>
</div>
</div>
</div>
diff --git a/hypha/apply/projects/templates/application_projects/sow_export.html b/hypha/apply/projects/templates/application_projects/sow_export.html
index 7bbd83579..a4eb37623 100644
--- a/hypha/apply/projects/templates/application_projects/sow_export.html
+++ b/hypha/apply/projects/templates/application_projects/sow_export.html
@@ -1,3 +1,5 @@
+{% load i18n %}
+
<html>
<head>
<title>{{ title|default:"" }}</title>
@@ -80,7 +82,7 @@
{%block page_foot%}
<table>
<tr>
- <td>Exported by {{ export_user }} on {{ export_date }}</td>
+ <td>{% blocktrans %}Exported by {{ export_user }} on {{ export_date }}{% endblocktrans %}</td>
<td align="right">
Page: <pdf:pagenumber />
</td>
diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py
index c8c03844e..b43d9cd6e 100644
--- a/hypha/apply/projects/views/project.py
+++ b/hypha/apply/projects/views/project.py
@@ -381,7 +381,7 @@ class UpdateLeadView(DelegatedViewMixin, UpdateView):
request=self.request,
user=self.request.user,
source=project,
- related=old_lead or "Unassigned",
+ related=old_lead or _("Unassigned"),
)
messages.success(
diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py
index 71598f2c5..a681399fe 100644
--- a/hypha/apply/projects/views/project_partials.py
+++ b/hypha/apply/projects/views/project_partials.py
@@ -4,6 +4,7 @@ from django.contrib.auth.decorators import login_required
from django.db.models import Count
from django.shortcuts import get_object_or_404, render
from django.urls import reverse_lazy
+from django.utils.translation import gettext as _
from django.views.decorators.http import require_GET
from hypha.apply.activity.services import (
@@ -60,7 +61,7 @@ def get_project_status_counts(request):
"funds/includes/status-block.html",
{
"status_counts": status_counts,
- "type": "Projects",
+ "type": _("Projects"),
},
)
@@ -99,6 +100,6 @@ def get_invoices_status_counts(request):
"funds/includes/status-block.html",
{
"status_counts": status_counts,
- "type": "Invoices",
+ "type": _("Invoices"),
},
)
diff --git a/hypha/apply/projects/views/vendor.py b/hypha/apply/projects/views/vendor.py
index cb53405ce..315c3a2f6 100644
--- a/hypha/apply/projects/views/vendor.py
+++ b/hypha/apply/projects/views/vendor.py
@@ -265,7 +265,7 @@ class VendorDetailView(DetailVendorAccessMixin, DetailView):
vendor_form_settings.required_to_pay_taxes_label,
vendor.required_to_pay_taxes,
),
- ("Due Diligence Documents", ""),
+ (_("Due Diligence Documents"), ""),
]
group = group + 1
data.setdefault(
diff --git a/hypha/apply/users/templates/users/login.html b/hypha/apply/users/templates/users/login.html
index 178814a00..a9f8eed60 100644
--- a/hypha/apply/users/templates/users/login.html
+++ b/hypha/apply/users/templates/users/login.html
@@ -17,11 +17,11 @@
<p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
sent.{% endblocktrans %}</p>
{% else %}
- <h2 class="text-2xl">Two Factor Verification</h2>
+ <h2 class="text-2xl">{% trans "Two factor verification" %}</h2>
<p>{% blocktrans trimmed %}Please enter the 6-digit verification code generated by your Authenticator App.{% endblocktrans %}</p>
{% endif %}
{% elif wizard.steps.current == 'backup' %}
- <h2 class="text-2xl">Two Factor Verification</h2>
+ <h2 class="text-2xl">{% trans "Two factor verification" %}</h2>
<p>
{% blocktrans trimmed %}Please enter one of the backup codes to login to your account.{% endblocktrans %}
</p>
@@ -42,7 +42,7 @@
}
</style>
- <h2 class="text-2xl">Log in to {{ ORG_SHORT_NAME }}</h2>
+ <h2 class="text-2xl">{% blocktrans %}Log in to {{ ORG_SHORT_NAME }}{% endblocktrans %}</h2>
{% for field in form %}
<div class="relative max-w-sm {% if field.auto_id == "id_auth-password" %}mb-4{% endif %}">
{% include "forms/includes/field.html" %}
@@ -71,7 +71,7 @@
{% if GOOGLE_OAUTH2 %}
<div class="flex items-center justify-start relative">
<hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
- <span class="px-3 text-gray-400 font-medium">or</span>
+ <span class="px-3 text-gray-400 font-medium">{% trans "or" %}</span>
<hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
</div>
diff --git a/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html b/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
index 5e356cc1f..d0ad38924 100644
--- a/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
+++ b/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
@@ -23,7 +23,7 @@
</p>
<p>
- <a href="{% url 'users:passwordless_login_signup' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" class="font-medium hover:underline">Try again</a>
+ <a href="{% url 'users:passwordless_login_signup' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" class="font-medium hover:underline">{% trans "Try again" %}</a>
</p>
</section>
{% endblock content %}
diff --git a/hypha/apply/users/templates/users/password_reset/confirm.html b/hypha/apply/users/templates/users/password_reset/confirm.html
index cfe71e554..e51ba2dff 100644
--- a/hypha/apply/users/templates/users/password_reset/confirm.html
+++ b/hypha/apply/users/templates/users/password_reset/confirm.html
@@ -8,7 +8,7 @@
<div class="wrapper max-w-xl mt-12">
{% if validlink %}
- <h2 class="text-2xl">Reset Password</h2>
+ <h2 class="text-2xl">{% trans "Reset password" %}</h2>
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
<form class="form" method="post" novalidate>
@@ -44,7 +44,7 @@
</div>
</form>
{% else %}
- <p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
+ <p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
{% endif %}
</div>
{% endblock %}
diff --git a/hypha/apply/users/templates/users/passwordless_login_signup.html b/hypha/apply/users/templates/users/passwordless_login_signup.html
index 4fb5f44bd..a8af8c41a 100644
--- a/hypha/apply/users/templates/users/passwordless_login_signup.html
+++ b/hypha/apply/users/templates/users/passwordless_login_signup.html
@@ -14,7 +14,13 @@
<input type="hidden" name="next" value="{{ redirect_url }}">
{% endif %}
- <h2 class="text-2xl">Login {% if ENABLE_PUBLIC_SIGNUP %}or Signup {% endif %}to {{ ORG_SHORT_NAME }}</h2>
+ <h2 class="text-2xl">
+ {% if ENABLE_PUBLIC_SIGNUP %}
+ {% blocktrans %}Login or signup to {{ ORG_SHORT_NAME }}{% endblocktrans %}
+ {% else %}
+ {% blocktrans %}Login to {{ ORG_SHORT_NAME }}{% endblocktrans %}
+ {% endif %}
+ </h2>
<div>
{% for hidden in form.hidden_fields %}
@@ -41,7 +47,7 @@
<div class="flex items-center justify-start relative mb-4">
<hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
- <span class="px-3 text-gray-400 font-medium">or</span>
+ <span class="px-3 text-gray-400 font-medium">{% trans "or" %}</span>
<hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
</div>
diff --git a/hypha/apply/users/templates/users/register.html b/hypha/apply/users/templates/users/register.html
index 2728f6b8c..1b9b08de0 100644
--- a/hypha/apply/users/templates/users/register.html
+++ b/hypha/apply/users/templates/users/register.html
@@ -13,7 +13,7 @@
{% if redirect_url %}
<input type="hidden" value="{{ redirect_url }}" name="next">
{% endif %}
- <h2 class="text-2xl">Create your account</h2>
+ <h2 class="text-2xl">{% trans "Create your account" %}</h2>
{% if form.non_field_errors %}
<div class="wrapper wrapper--error">{{ form.non_field_errors.as_text }}</div>
diff --git a/hypha/apply/users/templates/wagtailusers/users/index.html b/hypha/apply/users/templates/wagtailusers/users/index.html
index f681270e0..1cbca30a3 100644
--- a/hypha/apply/users/templates/wagtailusers/users/index.html
+++ b/hypha/apply/users/templates/wagtailusers/users/index.html
@@ -1,5 +1,5 @@
{% extends "wagtailusers/users/index.html" %}
-{% load static %}
+{% load static %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'css/wagtail_users_list.css' %}">
diff --git a/hypha/core/templates/components/dropdown-menu.html b/hypha/core/templates/components/dropdown-menu.html
index 1f166f32a..827363993 100644
--- a/hypha/core/templates/components/dropdown-menu.html
+++ b/hypha/core/templates/components/dropdown-menu.html
@@ -1,4 +1,4 @@
-{% load heroicons %}
+{% load heroicons i18n %}
<div
x-data="{
open: false,
@@ -61,7 +61,7 @@
{% if attributes.enable_search %}
<filter-input aria-owns="dd-content-{{ id }}" class='py-3 px-3 border-b flex grow'>
- <label for="search-{{ id }}" class="sr-only">Filter {{ attributes.title }}</label>
+ <label for="search-{{ id }}" class="sr-only">{% trans "Filter" %} {{ attributes.title }}</label>
<input type="text"
autofocus
id="search-{{ id }}"
@@ -87,7 +87,7 @@
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
- <span class="sr-only">Loading...</span>
+ <span class="sr-only">{% trans "Loading…" %}</span>
</div>
{% endif %}
</div>
diff --git a/hypha/templates/base-apply.html b/hypha/templates/base-apply.html
index 72ae3df9b..89c4cc789 100644
--- a/hypha/templates/base-apply.html
+++ b/hypha/templates/base-apply.html
@@ -4,7 +4,7 @@
{% block header %}
<header class="header">
<div class="header__inner wrapper wrapper--large">
- <a href="{{ settings.utils.SystemMessagesSettings.site_logo_link|default:"/" }}" aria-label="Home link">
+ <a href="{{ settings.utils.SystemMessagesSettings.site_logo_link|default:"/" }}" aria-label="{% trans "Home link" %}">
{% if settings.utils.SystemMessagesSettings.site_logo_default %}
{% image settings.utils.SystemMessagesSettings.site_logo_default width-215 as logo_default %}
<img class="header__logo header__logo--desktop"
@@ -31,12 +31,12 @@
width="215"
height="40"
src="{% static 'images/logo.png' %}"
- alt="Hypha logo"
+ alt="{% trans "Hypha logo" %}"
>
<img class="header__logo header__logo--mobile"
width="60" height="60"
src="{% static 'images/logo-small.png' %}"
- alt="Hypha logo"
+ alt="{% trans "Hypha logo" %}"
>
{% endif %}
</a>
@@ -44,7 +44,7 @@
<div class="header__inner header__inner--mobile-buttons">
{% if request.user.is_authenticated %}
<button class="button button--left-space js-mobile-menu-toggle" aria-haspopup="true">
- <span class="sr-only">{% trans "Open Menu" %}</span>
+ <span class="sr-only">{% trans "Open menu" %}</span>
{% heroicon_outline "bars-3" size=32 stroke_width=2 class="inline" aria_hidden="true" %}
</button>
{% else %}
@@ -78,7 +78,7 @@
width="60"
height="60"
src="{% static 'images/logo-small.png' %}"
- alt="Hypha logo"
+ alt="{% trans "Hypha logo" %}"
>
{% endif %}
</a>
@@ -112,7 +112,7 @@
aria-haspopup="activity"
aria-expanded="false"
role="button"
- title="Click to open your notifications"
+ title="{% trans "Click to open your notifications" %}"
@click.prevent="open = ! open"
>
{% heroicon_outline "bell-alert" class="inline me-1 text-black" aria_hidden="true" %}
diff --git a/hypha/templates/includes/messages.html b/hypha/templates/includes/messages.html
index 000e8204d..215580d0d 100644
--- a/hypha/templates/includes/messages.html
+++ b/hypha/templates/includes/messages.html
@@ -1,4 +1,4 @@
-{% load heroicons %}
+{% load heroicons i18n %}
<ul class="messages">
{% for message in messages %}
{% if 'project_action_message' in message.tags %}
@@ -10,7 +10,7 @@
{% heroicon_outline "check" stroke_width=2 class="inline-block me-1 w-4 h-4" aria_hidden=true %}
<p class="messages__copy">{{ message }}</p>
<button type="button" class="p-2 hover:opacity-70" x-on:click="show = !show">
- <span class="sr-only">Close</span>
+ <span class="sr-only">{% trans "Close" %}</span>
{% heroicon_outline "x-mark" stroke_width=2 class="inline" aria_hidden=true %}
</button>
</li>
--
GitLab