From 2ceb58ca798345f3a85b4e0d11d6bf59c2e4a2a9 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 4 Oct 2022 16:45:54 +0200 Subject: [PATCH] Fix some strings that was not translateble. --- .../activity/include/comment_form.html | 5 +- .../activity/include/listing_base.html | 2 +- .../include/notifications_dropdown.html | 4 +- .../dashboard/partner_dashboard.html | 2 +- .../determinations/determination_detail.html | 4 +- .../determinations/determination_form.html | 4 +- .../applicationsubmission_admin_detail.html | 2 +- .../funds/applicationsubmission_detail.html | 2 +- .../funds/applicationsubmission_form.html | 2 +- .../includes/no_round_block_dashboard.html | 3 +- .../funds/includes/revision_diff_table.html | 2 +- .../funds/includes/round-block-listing.html | 2 +- .../includes/screening_status_block.html | 2 +- .../includes/table_filter_and_search.html | 5 +- .../templates/funds/reviewer_leaderboard.html | 3 +- .../templates/funds/revisions_compare.html | 2 +- .../templates/funds/submissions_overview.html | 3 +- .../includes/invoices.html | 6 +- .../includes/report_line.html | 4 +- .../includes/required_checks_block.html | 4 +- .../includes/supporting_documents.html | 2 +- .../application_projects/invoice_form.html | 2 +- .../project_admin_detail.html | 2 +- .../project_approval_form.html | 6 +- .../application_projects/project_detail.html | 2 +- .../project_simplified_detail.html | 2 +- .../templates/review/review_detail.html | 2 +- .../templates/review/review_edit_form.html | 2 +- .../apply/templates/forms/includes/field.html | 2 +- .../templates/two_factor/admin/disable.html | 2 +- .../templates/two_factor/core/setup.html | 4 +- .../two_factor/core/setup_complete.html | 4 +- .../apply/users/templates/users/account.html | 4 +- hypha/apply/users/templates/users/login.html | 4 +- hypha/locale/django.pot | 577 +++++++++++------- hypha/locale/en/LC_MESSAGES/django.po | 577 +++++++++++------- hypha/templates/blocks/more_block.html | 2 +- .../includes/relatedcontent_card.html | 2 +- 38 files changed, 773 insertions(+), 488 deletions(-) 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" %}
{% include "funds/includes/admin_primary_actions.html" %}
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" %}
    {% endif %}
  • {{ submission.title }}
    • diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_form.html b/hypha/apply/funds/templates/funds/applicationsubmission_form.html index 7f41d66c57..6f2fc099c8 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_form.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_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 %}
    diff --git a/hypha/apply/funds/templates/funds/includes/no_round_block_dashboard.html b/hypha/apply/funds/templates/funds/includes/no_round_block_dashboard.html index e0e574b612..f0d46fdfed 100644 --- a/hypha/apply/funds/templates/funds/includes/no_round_block_dashboard.html +++ b/hypha/apply/funds/templates/funds/includes/no_round_block_dashboard.html @@ -1,7 +1,8 @@ {% extends 'funds/includes/round-block-listing.html' %} +{% load i18n %} {% block empty_round %}

    - You have no {{ type|lower }} rounds or labs assigned to you. + {% blocktrans with type=type|lower %}You have no {{ type }} rounds or labs assigned to you.{% endblocktrans %}

    {% endblock %} diff --git a/hypha/apply/funds/templates/funds/includes/revision_diff_table.html b/hypha/apply/funds/templates/funds/includes/revision_diff_table.html index 2f050c5beb..55ecc5325e 100644 --- a/hypha/apply/funds/templates/funds/includes/revision_diff_table.html +++ b/hypha/apply/funds/templates/funds/includes/revision_diff_table.html @@ -6,7 +6,7 @@ {% if forloop.first %}

    {% trans "Title" %}

    {{ from_field }}

    {% trans "Title" %}

    {{ to_field }} {% elif forloop.counter == 2 %} -
    Legal Name
    {{ from_field }}
    {% trans "Legal Name" %}
    {{ to_field }} +
    {% trans "Legal Name" %}
    {{ from_field }}
    {% trans "Legal Name" %}
    {{ to_field }} {% elif forloop.counter == 3 %}
    {% trans "E-mail" %}
    {{ from_field }}
    {% trans "E-mail" %}
    {{ to_field }} {% elif forloop.counter == 4 %} diff --git a/hypha/apply/funds/templates/funds/includes/round-block-listing.html b/hypha/apply/funds/templates/funds/includes/round-block-listing.html index 3408ba67fd..a10cf7cdb6 100644 --- a/hypha/apply/funds/templates/funds/includes/round-block-listing.html +++ b/hypha/apply/funds/templates/funds/includes/round-block-listing.html @@ -10,7 +10,7 @@ {% if round.end_date %} {{ display_text }} {{ round.end_date|date:"SHORT_DATE_FORMAT" }} {% else %} - Open + {% trans "Open" %} {% endif %}

    diff --git a/hypha/apply/funds/templates/funds/includes/screening_status_block.html b/hypha/apply/funds/templates/funds/includes/screening_status_block.html index 6f6b786c3c..3c0063fc13 100644 --- a/hypha/apply/funds/templates/funds/includes/screening_status_block.html +++ b/hypha/apply/funds/templates/funds/includes/screening_status_block.html @@ -33,7 +33,7 @@

    {% trans "Screening decision" %}
    {% endfor%}
    {% endif %} - {% trans "Screening options<" %}/a> + {% trans "Screening options" %}

    {% endif %} {% if not object.supports_default_screening %} 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 a604f3237d..d67bc300ff 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 @@ -53,10 +53,11 @@

    {{ heading }}

    {% if use_search|default:False %} {% endif %}
    diff --git a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html index fd10c1fd89..d83233db7c 100644 --- a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html +++ b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html @@ -21,7 +21,8 @@
    {% trans "Track and explore the reviews" %}
    {% block table %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading="All reviewers" %} + {% trans "All reviewers" as all_reviewers %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading=all_reviewers %} {% render_table table %} {% endblock %} diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html index 3b033de7e8..eaf55100d6 100644 --- a/hypha/apply/funds/templates/funds/revisions_compare.html +++ b/hypha/apply/funds/templates/funds/revisions_compare.html @@ -5,7 +5,7 @@

    {% trans "Comparing revisions" %}

    -
    For {{ object.title }}
    +
    {% trans "For" %} {{ object.title }}
    {% trans "Back to revisions" %}
    diff --git a/hypha/apply/funds/templates/funds/submissions_overview.html b/hypha/apply/funds/templates/funds/submissions_overview.html index 97681e7d7f..1068532881 100644 --- a/hypha/apply/funds/templates/funds/submissions_overview.html +++ b/hypha/apply/funds/templates/funds/submissions_overview.html @@ -42,7 +42,8 @@
    {% trans "Track and explore recent submissions" %}
    {% block table %}
    - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False heading="All Submissions" %} + {% trans "All Submissions" as all_submissions %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False heading=all_submissions %} {% render_table table %}
    diff --git a/hypha/apply/projects/templates/application_projects/includes/invoices.html b/hypha/apply/projects/templates/application_projects/includes/invoices.html index 53f958d05c..abb8baa178 100644 --- a/hypha/apply/projects/templates/application_projects/includes/invoices.html +++ b/hypha/apply/projects/templates/application_projects/includes/invoices.html @@ -25,18 +25,18 @@ {% trans "Invoice Number" %}: {{ invoice.vendor_document_number }} {% trans "Status" %}: {{ invoice.get_status_display }} - View + {% trans "View" %} {% can_edit invoice user as user_can_edit_request %} {% if user_can_edit_request %} - Edit + {% trans "Edit" %} {% endif %} {% can_delete invoice user as user_can_delete_request %} {% if user_can_delete_request %} - Delete + {% trans "Delete" %} {% endif %} diff --git a/hypha/apply/projects/templates/application_projects/includes/report_line.html b/hypha/apply/projects/templates/application_projects/includes/report_line.html index a5e5487630..7f9d8ff77e 100644 --- a/hypha/apply/projects/templates/application_projects/includes/report_line.html +++ b/hypha/apply/projects/templates/application_projects/includes/report_line.html @@ -2,7 +2,7 @@
  • {% if current %} - {% trans "The" %} {% if report.can_submit %}current{% else %}{% trans "next" %}{% endif %} {% trans "reporting period is" %} + {% trans "The" %} {% if report.can_submit %}{% trans "current" %}{% else %}{% trans "next" %}{% endif %} {% trans "reporting period is" %} {% else %} {% trans "A report is due for the period" %} {% endif %} @@ -24,7 +24,7 @@ {% if request.user.is_apply_staff and report.can_submit %} - + diff --git a/hypha/apply/projects/templates/application_projects/invoice_form.html b/hypha/apply/projects/templates/application_projects/invoice_form.html index d790ff7445..1dac38d065 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_form.html +++ b/hypha/apply/projects/templates/application_projects/invoice_form.html @@ -5,7 +5,7 @@ {% block content %}
    -

    {% if object %}Editing{% else %}Create{% endif %} {% trans "Invoice" %}

    +

    {% if object %}{% trans "Editing" %}{% else %}{% trans "Create" %}{% endif %} {% trans "Invoice" %}

    {% if object %}{{ object.project.title }}{% else %}{% trans "For" %}: {{ project.title }}{% endif %}
    diff --git a/hypha/apply/projects/templates/application_projects/project_admin_detail.html b/hypha/apply/projects/templates/application_projects/project_admin_detail.html index 15a0f04803..1434913d68 100644 --- a/hypha/apply/projects/templates/application_projects/project_admin_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_admin_detail.html @@ -17,7 +17,7 @@
    {% trans "Are you sure you're ready to submit?" %}
    {% endfor %}
{% 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 }}