diff --git a/hypha/apply/activity/templates/activity/include/comment_form.html b/hypha/apply/activity/templates/activity/include/comment_form.html index ac6180410b..e12a5c8711 100644 --- a/hypha/apply/activity/templates/activity/include/comment_form.html +++ b/hypha/apply/activity/templates/activity/include/comment_form.html @@ -1,4 +1,7 @@ +{% load i18n %} +

Add communication

- {% include 'funds/includes/delegated_form_base.html' with form=comment_form value='Submit' extra_classes='form__comments'%} + {% trans "Submit" as submit %} + {% include "funds/includes/delegated_form_base.html" with form=comment_form value=submit extra_classes="form__comments" %}
diff --git a/hypha/apply/activity/templates/activity/include/listing_base.html b/hypha/apply/activity/templates/activity/include/listing_base.html index 6a32c0de38..0259efddaf 100644 --- a/hypha/apply/activity/templates/activity/include/listing_base.html +++ b/hypha/apply/activity/templates/activity/include/listing_base.html @@ -12,7 +12,7 @@ {% if activity.user == request.user %}

- Edit + {% trans "Edit" %}

diff --git a/hypha/apply/activity/templates/activity/include/notifications_dropdown.html b/hypha/apply/activity/templates/activity/include/notifications_dropdown.html index 5a19753383..3abd7b52d6 100644 --- a/hypha/apply/activity/templates/activity/include/notifications_dropdown.html +++ b/hypha/apply/activity/templates/activity/include/notifications_dropdown.html @@ -5,7 +5,7 @@ diff --git a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html index 1b16df9b7e..38a6514bba 100644 --- a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html @@ -34,7 +34,7 @@

{% trans "Your active submissions" %}

{{ submission.title }}
-
{% trans "Submitted" %}: {{ submission.submit_time.date }} by {{ submission.user.get_full_name }}
+
{% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
{% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
diff --git a/hypha/apply/determinations/templates/determinations/determination_detail.html b/hypha/apply/determinations/templates/determinations/determination_detail.html index 73726f30a4..85562bc988 100644 --- a/hypha/apply/determinations/templates/determinations/determination_detail.html +++ b/hypha/apply/determinations/templates/determinations/determination_detail.html @@ -11,7 +11,7 @@

{% trans "Determination" %} {% if determination.is_draft %}[{% trans "DRAFT" %}]{% endif %}

-
For: {{ determination.submission.title }}
+
{% trans "For" %}: {{ determination.submission.title }}
@@ -30,7 +30,7 @@
{% trans "Determination" %}: {{ determination.
-

Determination message

+

{% trans "Determination message" %}

{{ determination.message|bleach }} {% for group in determination.detailed_data.values %} {% if group.title %} diff --git a/hypha/apply/determinations/templates/determinations/determination_form.html b/hypha/apply/determinations/templates/determinations/determination_form.html index 1af01a320d..f56f62e62d 100644 --- a/hypha/apply/determinations/templates/determinations/determination_form.html +++ b/hypha/apply/determinations/templates/determinations/determination_form.html @@ -4,8 +4,8 @@ {% block header %}
-

{% if object %}{% trans "Edit Determination" %} {% if object.is_draft %}draft{% endif %}{% else %}{% trans "Create Determination" %}{% endif %}

-
For {{ submission.title }}
+

{% if object %}{% trans "Edit Determination" %} {% if object.is_draft %}{% trans "draft" %}{% endif %}{% else %}{% trans "Create Determination" %}{% endif %}

+
{% trans "For" %} {{ submission.title }}
{% endblock %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html index aec299f435..d0f76b2597 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html @@ -7,7 +7,7 @@ {% endblock %} {% block mobile_actions %} - Actions to take + {% trans "Actions to take" %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index 1579e0a39b..2fd6921a79 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -134,7 +134,7 @@
{% trans "Related submissions" %}
{% for submission in other_submissions %} {% if forloop.first %} -
Past Submissions
+
{% trans "Past Submissions" %}
{% trans "Submit anyway" as submit_anyway %} - {% include 'funds/includes/delegated_form_base.html' with form=request_approval_form value='Submit anyway' cancel=True invert=True %} + {% include 'funds/includes/delegated_form_base.html' with form=request_approval_form value=submit_anyway cancel=True invert=True %} {% else %} {% trans "Request" as request %} {% include 'funds/includes/delegated_form_base.html' with form=request_approval_form value=request %} diff --git a/hypha/apply/projects/templates/application_projects/project_approval_form.html b/hypha/apply/projects/templates/application_projects/project_approval_form.html index 419a99ad35..24191da713 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_form.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_form.html @@ -1,6 +1,6 @@ {% extends "base-apply.html" %} {% load i18n static %} -{% block title %}Editing: {{object.title }}{% endblock %} +{% block title %}{% trans "Editing" %}: {{object.title }}{% endblock %} {% block content %}
@@ -47,8 +47,8 @@

{% trans "Editing" %}: {{ object.title }}

- Approval form not configured. Please add an approval form in the - fund settings. + {% trans "Approval form not configured. Please add an approval form in the" %} + {% trans "fund settings" %}.

diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html index aae7ba9cac..f1b4f18c3f 100644 --- a/hypha/apply/projects/templates/application_projects/project_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_detail.html @@ -30,7 +30,7 @@

{{ object.submission.round }} {% endif %} - Lead: {{ object.lead }} + {% trans "Lead" %}: {{ object.lead }}
diff --git a/hypha/apply/projects/templates/application_projects/project_simplified_detail.html b/hypha/apply/projects/templates/application_projects/project_simplified_detail.html index 5bc3b1bb05..a490c930ea 100644 --- a/hypha/apply/projects/templates/application_projects/project_simplified_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_simplified_detail.html @@ -108,7 +108,7 @@
{% trans "Staff Reviewers" %}
{{ review.author }} {% if review.author.role %} - as {{ review.author.role }} + {% trans "as" %} {{ review.author.role }} {% endif %} - {{ review.created_at|date:"DATE_FORMAT" }} diff --git a/hypha/apply/review/templates/review/review_detail.html b/hypha/apply/review/templates/review/review_detail.html index 140a1a7d7d..ed242f20a1 100644 --- a/hypha/apply/review/templates/review/review_detail.html +++ b/hypha/apply/review/templates/review/review_detail.html @@ -7,7 +7,7 @@ {% trans "Back to submission" %} -

Review

+

{% trans "Review" %}

{% trans "For" %}: {{ review.submission.title }} {% trans "by" %} {{ review.author }} {% trans "at" %} {{ review.created_at|date:"SHORT_DATE_FORMAT" }} {% if review.is_updated %}({% trans "Last updated" %}: {{ review.updated_at|date:"SHORT_DATE_FORMAT" }}){% endif %}
{% include 'review/includes/review_opinions_list.html' with opinions=review.opinions.all %} diff --git a/hypha/apply/review/templates/review/review_edit_form.html b/hypha/apply/review/templates/review/review_edit_form.html index 89920c01f0..7664e51b80 100644 --- a/hypha/apply/review/templates/review/review_edit_form.html +++ b/hypha/apply/review/templates/review/review_edit_form.html @@ -5,7 +5,7 @@

{{ title }}

-
For {{ submission.title }}
+
{% trans "For" %} {{ submission.title }}
diff --git a/hypha/apply/templates/forms/includes/field.html b/hypha/apply/templates/forms/includes/field.html index 5b5e3cdfa6..079138e5a7 100644 --- a/hypha/apply/templates/forms/includes/field.html +++ b/hypha/apply/templates/forms/includes/field.html @@ -5,7 +5,7 @@ {% if widget_type == 'clearable_file_input' or widget_type == 'multi_file_input' or widget_type == 'single_file_field_widget' or widget_type == 'multi_file_field_widget'%} {{ field.label }}