Merge pull request #2998 from HyphaApp/maintenance/missing_translatio…

…ns_oct_22

Fix some strings that was not translateble.

hypha/apply/activity/templates/activity/include/comment_form.html

@@ -1,4 +1,7 @@
+{% load i18n %}
+
 <h4>Add communication</h4>
 <div class="wrapper wrapper--comments">
-    {% 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" %}
 </div>

hypha/apply/activity/templates/activity/include/listing_base.html

@@ -12,7 +12,7 @@
                 {% if activity.user == request.user %}
                     <p class="feed__meta-item feed__meta-item--edit-button">
                         <a class="link link--edit-submission is-active js-edit-comment" href="#">
-                            Edit
+                            {% trans "Edit" %}
                             <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
                         </a>
                     </p>

hypha/apply/activity/templates/activity/include/notifications_dropdown.html

@@ -5,7 +5,7 @@
         <svg class="icon"><use xlink:href="#bell-icon"></use></svg>
     </a>
     <div class="notifications__content zeta hidden" role="activity">
-        <h5>Notifications</h5>
+        <h5>{% trans "Notifications" %}</h5>
         {% for activity in latest_notifications %}
         <p class="notifications__item">
             <strong>{{ activity.source_content_type.name|source_type }} </strong>
@@ -14,6 +14,6 @@ <h5>Notifications</h5>
             {% if activity.related_object %}<a href="{{ activity.related_object.get_absolute_url }}">{{ activity.related_object|model_verbose_name }}</a>{% endif %}
         </p>
         {% endfor %}
-        <p class="notifications__more"><a href="{% url "activity:notifications" %}">Show All</a></p>
+        <p class="notifications__more"><a href="{% url "activity:notifications" %}">{% trans "Show All" %}</a></p>
     </div>
 </div>

hypha/apply/dashboard/templates/dashboard/partner_dashboard.html

@@ -34,7 +34,7 @@ <h4 class="heading heading--normal">{% trans "Your active submissions" %}</h4>
                 <div class="wrapper wrapper--status-bar-inner">
                     <div>
                         <h5 class="heading heading--no-margin"><a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h5>
-                        <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} by {{ submission.user.get_full_name }}</h6>
+                        <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}</h6>
                     </div>
                     {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
                 </div>

hypha/apply/determinations/templates/determinations/determination_detail.html

@@ -11,7 +11,7 @@
         </a>
         <h2 class="heading heading--no-margin">{% trans "Determination" %} {% if determination.is_draft %}[{% trans "DRAFT" %}]{% endif %}
         </h2>
-        <h5>For: {{ determination.submission.title }}</h5>
+        <h5>{% trans "For" %}: {{ determination.submission.title }}</h5>
     </div>
 </div>
 
@@ -30,7 +30,7 @@ <h5 class="determination-outcome">{% trans "Determination" %}: {{ determination.
 </div>
 
 <div class="rich-text rich-text--answers">
-    <h4>Determination message</h4>
+    <h4>{% trans "Determination message" %}</h4>
     {{ determination.message|bleach }}
     {% for group in determination.detailed_data.values %}
         {% if group.title %}

hypha/apply/determinations/templates/determinations/determination_form.html

@@ -4,8 +4,8 @@
 {% block header %}
 <div class="admin-bar">
     <div class="admin-bar__inner">
-        <h2 class="heading heading--no-margin">{% if object %}{% trans "Edit Determination" %} {% if object.is_draft %}draft{% endif %}{% else %}{% trans "Create Determination" %}{% endif %}</h2>
-        <h5>For <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
+        <h2 class="heading heading--no-margin">{% if object %}{% trans "Edit Determination" %} {% if object.is_draft %}{% trans "draft" %}{% endif %}{% else %}{% trans "Create Determination" %}{% endif %}</h2>
+        <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
     </div>
 </div>
 {% endblock %}

hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html

@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block mobile_actions %}
-    <a class="js-actions-toggle button button--white button--full-width button--actions">Actions to take</a>
+    <a class="js-actions-toggle button button--white button--full-width button--actions">{% trans "Actions to take" %}</a>
     <div class="js-actions-sidebar sidebar__inner sidebar__inner--light-blue sidebar__inner--actions sidebar__inner--mobile">
         {% include "funds/includes/admin_primary_actions.html"  %}
     </div>

hypha/apply/funds/templates/funds/applicationsubmission_detail.html

@@ -134,7 +134,7 @@ <h5>{% trans "Related submissions" %}</h5>
 
                             {% for submission in other_submissions %}
                                 {% if forloop.first %}
-                                <h6 class="heading heading--light-grey heading--uppercase">Past Submissions</h6>
+                                <h6 class="heading heading--light-grey heading--uppercase">{% trans "Past Submissions" %}</h6>
                                 <ul>
                                 {% endif %}
                                 <li><a class="link link--underlined link--bold" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></li>

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 %}
 <div class="admin-bar">
     <div class="admin-bar__inner">

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 %}
     <p class="round-block__not-found">
-        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 %}
     </p>
 {% endblock %}

hypha/apply/funds/templates/funds/includes/revision_diff_table.html

@@ -6,7 +6,7 @@
     {% if forloop.first %}
         <tr><td><h4>{% trans "Title" %}</h4>{{ from_field }}</td><td><h4>{% trans "Title" %}</h4>{{ to_field }}</td></tr>
     {% elif forloop.counter == 2 %}
-        <tr><td><h5>Legal Name</h5>{{ from_field }}</td><td><h5>{% trans "Legal Name" %}</h5>{{ to_field }}</td></tr>
+        <tr><td><h5>{% trans "Legal Name" %}</h5>{{ from_field }}</td><td><h5>{% trans "Legal Name" %}</h5>{{ to_field }}</td></tr>
     {% elif forloop.counter == 3 %}
         <tr><td><h5>{% trans "E-mail" %}</h5>{{ from_field }}</td><td><h5>{% trans "E-mail" %}</h5>{{ to_field }}</td></tr>
     {% elif forloop.counter == 4 %}

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 %}
                     </p>
                     <p class="round-block__determination">

hypha/apply/funds/templates/funds/includes/screening_status_block.html

@@ -33,7 +33,7 @@ <h5>{% trans "Screening decision" %}</h5>
                     {% endfor%}
                 </div>
                 {% endif %}
-                <a id="screening-options" data-fancybox="" data-src="#screen-application" data-yes="{% if object.has_yes_default_screening_status_set %}true{% else %}false{% endif %}" class="link link--secondary-change" href="#">{% trans "Screening options<" %}/a>
+                <a id="screening-options" data-fancybox="" data-src="#screen-application" data-yes="{% if object.has_yes_default_screening_status_set %}true{% else %}false{% endif %}" class="link link--secondary-change" href="#">{% trans "Screening options" %}</a>
             </p>
         {% endif %}
         {% if not object.supports_default_screening %}

hypha/apply/funds/templates/funds/includes/table_filter_and_search.html

@@ -53,10 +53,11 @@ <h4 class="heading heading--normal heading--no-margin">{{ heading }}</h4>
 
             {% 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" aria-label="{% trans "Search" %}">
+                <button class="button button--search" type="submit" aria-label="{% trans 'Search' %}">
                     <svg class="icon icon--magnifying-glass icon--search"><use xlink:href="#magnifying-glass"></use></svg>
                 </button>
-                <input class="input input--search input--secondary" type="text" placeholder="Search {{ search_placeholder|default:"submissions" }}" name="query"{% if search_term %} value="{{ search_term }}"{% endif %} aria-label="{% trans "Search input" %}">
+                {% trans "submissions" as submissions %}
+                <input class="input input--search input--secondary" type="text" placeholder="{% trans 'Search' %} {{ search_placeholder|default:submissions }}" name="query"{% if search_term %} value="{{ search_term }}"{% endif %} aria-label="{% trans 'Search input' %}">
             </form>
             {% endif %}
         </div>

hypha/apply/funds/templates/funds/reviewer_leaderboard.html

@@ -21,7 +21,8 @@ <h5>{% trans "Track and explore the reviews" %}</h5>
 
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
     {% 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 %}

hypha/apply/funds/templates/funds/revisions_compare.html

@@ -5,7 +5,7 @@
 <div class="admin-bar">
     <div class="admin-bar__inner">
         <h2 class="heading heading--no-margin">{% trans "Comparing revisions" %}</h2>
-        <h5>For <a href="{% url "funds:submissions:detail" object.id %}">{{ object.title }}</a></h5>
+        <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" object.id %}">{{ object.title }}</a></h5>
         <h5><a href="{% url "funds:submissions:revisions:list" object.id %}">{% trans "Back to revisions" %}</a></h5>
     </div>
 </div>

hypha/apply/funds/templates/funds/submissions_overview.html

@@ -42,7 +42,8 @@ <h5>{% trans "Track and explore recent submissions" %}</h5>
 
     {% block table %}
         <div class="wrapper wrapper--bottom-space">
-            {% 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 %}
             <div class="all-submissions-table__more">

hypha/apply/projects/templates/application_projects/includes/invoices.html

@@ -25,18 +25,18 @@
                     <td><span class="data-block__mobile-label">{% trans "Invoice Number" %}: </span>{{ invoice.vendor_document_number }}</td>
                     <td><span class="data-block__mobile-label">{% trans "Status" %}: </span>{{ invoice.get_status_display }}</td>
                     <td>
-                        <a class="data-block__action-link" href="{{ invoice.get_absolute_url }}">View</a>
+                        <a class="data-block__action-link" href="{{ invoice.get_absolute_url }}">{% trans "View" %}</a>
                         {% can_edit invoice user as user_can_edit_request %}
                         {% if user_can_edit_request %}
                         <a class="data-block__action-link" href="{% url "apply:projects:invoice-edit" pk=invoice.project.pk invoice_pk=invoice.pk %}">
-                            Edit
+                            {% trans "Edit" %}
                         </a>
                         {% endif %}
 
                         {% can_delete invoice user as user_can_delete_request %}
                         {% if user_can_delete_request %}
                         <a class="data-block__action-link" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
-                            Delete
+                            {% trans "Delete" %}
                         </a>
                         {% endif %}
                     </td>

hypha/apply/projects/templates/application_projects/includes/report_line.html

@@ -2,7 +2,7 @@
 <li class="data-block__list-item">
     <div class="data-block__info">
         {% 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 %}
 
-            <input data-fancybox data-src="#skip-report-{{report.id}}" type="button" value="{% trans "Skip" %}" class="btn data-block__action-link"></input>
+            <input data-fancybox data-src="#skip-report-{{report.id}}" type="button" value="{% trans 'Skip' %}" class="btn data-block__action-link"></input>
 
             <!-- Skip report confirmation modal -->
             <div class="modal" id="skip-report-{{report.id}}">

hypha/apply/projects/templates/application_projects/includes/required_checks_block.html

@@ -10,15 +10,15 @@ <h5>{% trans "Required Checks" %}</h5>
         <br>
         <div class="required-checks-checkbox">
             <input type="checkbox" name="valid_checks" id="valid_checks" {% if invoice.valid_checks %}checked{% endif %} {% if not user_can_complete_required_checks %} disabled {% endif %}>
-            <span>Valid OFAC, SAM, W8/W9 on file</span>
+            <span>{% trans "Valid OFAC, SAM, W8/W9 on file" %}</span>
         </div>
         <br>
         <div class="required-checks-link">
             <b><label>{% trans "Link to SAM/OFAC/W8/W9:" %}</label></b>
             <textarea name="valid-checks-link" id="valid-checks-link" rows=3 cols=30 required {% if not user_can_complete_required_checks %} disabled {% endif %}>{{ invoice.valid_checks_link }}</textarea> 
         </div>
         {% if user_can_complete_required_checks %}
-            <input type="submit" value="Save">
+            <input type="submit" value="{% trans 'Save' %}">
         {% endif %}
     </form>
     <br>

hypha/apply/projects/templates/application_projects/includes/supporting_documents.html

@@ -122,7 +122,7 @@ <h5 class="docs-block__heading">{% trans "Supporting documents" %}</h5>
                                 name="{{ form_prefix }}{{ remove_document_form.name }}"
                                 type="submit"
                                 form="{{ remove_document_form.name }}"
-                                value="{% trans "Remove" %}" />
+                                value="{% trans 'Remove' %}" />
                         </form>
                             </input>
                     </div>

hypha/apply/projects/templates/application_projects/invoice_form.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="admin-bar">
     <div class="admin-bar__inner">
-        <h2 class="heading heading--no-margin">{% if object %}Editing{% else %}Create{% endif %} {% trans "Invoice" %}</h2>
+        <h2 class="heading heading--no-margin">{% if object %}{% trans "Editing" %}{% else %}{% trans "Create" %}{% endif %} {% trans "Invoice" %}</h2>
         <h5 class="heading heading--no-margin">{% if object %}{{ object.project.title }}{% else %}{% trans "For" %}: {{ project.title }}{% endif %}</h5>
     </div>
 </div>

hypha/apply/projects/templates/application_projects/project_admin_detail.html

@@ -17,7 +17,7 @@ <h5>{% trans "Are you sure you're ready to submit?" %}</h5>
             {% endfor %}
         </ul>
         {% 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 %}

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 %}
 <div class="admin-bar">
     <div class="admin-bar__inner">
@@ -47,8 +47,8 @@ <h2 class="heading heading--no-margin">{% trans "Editing" %}: {{ object.title }}
     <div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
         <div class="wrapper--sidebar--inner">
             <p>
-                Approval form not configured. Please add an approval form in the
-                <a href="{% url 'funds_fundtype_modeladmin_edit' object.submission.page.id %}" target="_blank">fund settings</a>.
+                {% trans "Approval form not configured. Please add an approval form in the" %}
+                <a href="{% url 'funds_fundtype_modeladmin_edit' object.submission.page.id %}" target="_blank">{% trans "fund settings" %}</a>.
             </p>
         </div>
     </div>

hypha/apply/projects/templates/application_projects/project_detail.html

@@ -30,7 +30,7 @@ <h5 class="heading heading--meta">
                 <span>{{ object.submission.round }}</span>
             {% endif %}
 
-            <span>Lead: {{ object.lead }}</span>
+            <span>{% trans "Lead" %}: {{ object.lead }}</span>
 
         </h5>
 

hypha/apply/projects/templates/application_projects/project_simplified_detail.html

@@ -108,7 +108,7 @@ <h5>{% trans "Staff Reviewers" %}</h5>
                         <span class="card__reviewer">
                             {{ review.author }}
                             {% if review.author.role %}
-                                as {{ review.author.role }}
+                                {% trans "as" %} {{ review.author.role }}
                             {% endif %}
                             - {{ review.created_at|date:"DATE_FORMAT" }}
                         </span>

hypha/apply/review/templates/review/review_detail.html

@@ -7,7 +7,7 @@
         <a class="simplified__submissions-link" href="{{ review.submission.get_absolute_url }}">
             {% trans "Back to submission" %}
         </a>
-        <h1 class="beta heading heading--no-margin heading--bold">Review</h1>
+        <h1 class="beta heading heading--no-margin heading--bold">{% trans "Review" %}</h1>
         <h5>{% trans "For" %}: {{ review.submission.title }} {% trans "by" %} {{ review.author }} {% trans "at" %} {{ review.created_at|date:"SHORT_DATE_FORMAT" }} {% if review.is_updated %}<small>({% trans "Last updated" %}: {{ review.updated_at|date:"SHORT_DATE_FORMAT" }})</small>{% endif %}</h5>
 
         {% include 'review/includes/review_opinions_list.html' with opinions=review.opinions.all %}

hypha/apply/review/templates/review/review_edit_form.html

@@ -5,7 +5,7 @@
 <div class="admin-bar">
     <div class="admin-bar__inner">
         <h1 class="beta heading heading--no-margin heading--bold">{{ title }}</h1>
-        <h5>For <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
+        <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
     </div>
 </div>
 

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'%}
         <span class="form__question">{{ field.label }}</span>
         <label for="{{ field.id_for_label }}" class="form__question form__question--{{ field_type }} {{ widget_type }}" {% if field.field.required %}required{% endif %}>
-            <span>Upload</span>
+            <span>{% trans "Upload" %}</span>
             {% if field.field.required %}
                 <span class="form__required">*</span>
             {% endif %}