Skip to content

Commit

Permalink
[translations]Updated translations keys [en], comment informed-govern…
Browse files Browse the repository at this point in the history
  • Loading branch information
jfrocha committed Dec 10, 2024
1 parent 079aeaa commit 3d35ca3
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 44 deletions.
10 changes: 5 additions & 5 deletions templates/contact_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

<div class="row">
<div class="col-md-6">
<h4>{{ _('Company information')}}</h4>
<h4>{{ _('Name of the Operator')}}</h4>
{% bootstrap_field wizard.form.company_name show_label=False placeholder=_("Name") %}
</div>
</div>
<div class="row">
<div class="col-md-6">
<h4>{{ _('Person in charge of the incident notification')}}</h4>
<h4>{{ _('Incident Notification Manager')}}</h4>
<div class="row">
<div class="col-md-6">
{% bootstrap_field wizard.form.contact_firstname show_label=False placeholder=_("First name") %}
Expand All @@ -23,7 +23,7 @@ <h4>{{ _('Person in charge of the incident notification')}}</h4>
</div>
<div class="row">
<div class="col-md-6">
{% bootstrap_field wizard.form.contact_email show_label=False placeholder=_("E-mail") %}
{% bootstrap_field wizard.form.contact_email show_label=False placeholder=_("Email") %}
</div>
<div class="col-md-6">
{% bootstrap_field wizard.form.contact_telephone show_label=False placeholder=_("Telephone") %}
Expand All @@ -35,7 +35,7 @@ <h4>{{ _('Person in charge of the incident notification')}}</h4>
<div class="col-md-6">
<h4>{{ _('Technical contact')}}</h4>
<div class="d-flex d-inline m-2 form-switch">
{% translate "Is the same person responsible for the technical aspect?" as translated_label %}
{% translate "Is the incident notification manager also the technical contact?" as translated_label %}
{% bootstrap_label translated_label label_class="pe-4" %}
{% bootstrap_field wizard.form.is_technical_the_same show_label=False%}
</div>
Expand All @@ -52,7 +52,7 @@ <h4>{{ _('Technical contact')}}</h4>
</div>
<div class="row">
<div class="col-md-6">
{% bootstrap_field wizard.form.technical_email show_label=False placeholder=_("E-mail") %}
{% bootstrap_field wizard.form.technical_email show_label=False placeholder=_("Email") %}
</div>
<div class="col-md-6">
{% bootstrap_field wizard.form.technical_telephone show_label=False placeholder=_("Telephone") %}
Expand Down
10 changes: 5 additions & 5 deletions templates/incidents_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h3>{% translate "Reported incidents" %}</h3>
{% if not is_regulator and not is_observer or is_regulator_incidents %}
<div>
<a role="button" class="btn btn-primary btn-sm" href="{% url 'declaration' %}">
{% translate "Report an incident" %}
{% translate "Notify an incident" %}
</a>
</div>
{% endif %}
Expand All @@ -37,7 +37,7 @@ <h3>{% translate "Reported incidents" %}</h3>
{% translate "Filter" %}
{% if is_filtered %}
<span>
({% translate "Applied" %})
({% translate "Active" %})
</span>
{% endif %}
<i class="bi bi-funnel-fill"></i>
Expand Down Expand Up @@ -81,7 +81,7 @@ <h3>{% translate "Reported incidents" %}</h3>
{% if is_observer %}
{% translate "Regulator" %}
{% else %}
{% translate "Regulation" %}
{% translate "Legal basis" %}
{% endif %}
</th>
<th>
Expand All @@ -97,7 +97,7 @@ <h3>{% translate "Reported incidents" %}</h3>
<table class="table table-borderless table-sm m-0">
<tr>
<td>{% translate "Report" %}</td>
<td>{% translate "Status" %}</td>
<td>{% translate "Report status" %}</td>
</tr>
</table>
</th>
Expand Down Expand Up @@ -176,7 +176,7 @@ <h3>{% translate "Reported incidents" %}</h3>
data-incident-ref="{{ incident.incident_id}}"
data-review-url="{% url 'review_workflow' %}?incident_workflow_id="
data-download-url="{% url 'download_incident_report_pdf' 0 %}" data-bs-toggle="modal"
data-bs-target="#report_versions" title="Report versions">
data-bs-target="#report_versions" title="{% translate 'Version control' %}">
<i class="bi bi-clock-history"></i>
</button>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/modals/delete_incident.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h4 class="modal-title" id="delete_incident_label">
</div>
<div class="modal-body">
<div>
{% translate "Are you sure you want to delete the incident?" %}
{% translate "Are you sure that you want to delete the incident?" %}
</div>
</div>
<div class="modal-footer">
Expand Down
2 changes: 1 addition & 1 deletion templates/modals/report_versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="modal-content">
<div class="modal-header bg-primary text-white">
<h4 class="modal-title" id="report_versions_label">
{{ _('Report versions') }}
{% translate "Report versions" %}
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
Expand Down
2 changes: 1 addition & 1 deletion templates/observer/incidents.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
data-download-url="{% url 'download_incident_report_pdf' 0 %}"
data-bs-toggle="modal"
data-bs-target="#report_versions"
title="Report versions">
title="{% translate 'Version control' %}">
<i class="bi bi-clock-history"></i>
</button>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/operator/incidents.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h3>{% translate "My incidents" %}</h3>
data-download-url="{% url 'download_incident_report_pdf' 0 %}"
data-bs-toggle="modal"
data-bs-target="#report_versions"
title="Report versions">
title="{% translate 'Version control' %}">
<i class="bi bi-clock-history"></i>
</button>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/parts/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{% endif %}
{% if is_staff %}
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">{% translate "Administration" %}</a>
<a class="nav-link" href="{% url 'admin:index' %}">{% translate "Settings" %}</a>
</li>
{% endif %}
<li class="nav-item dropdown">
Expand Down
4 changes: 2 additions & 2 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ <h5 class="my-3 py-3">{% trans "Enter your credentials." %}</h5>
{% if wizard.steps.current == 'auth' %}
<p class="small mb-2 pb-lg-2">
<a class="text-muted" href="{% url 'password_reset' %}">
{% translate "Have you forgotten your password or username?" %}
{% translate "Have you forgotten your password?" %}
</a>
</p>
<p>{% translate "Do you not have an account and need to report an incident?" %}</p>
<p>{% translate "No Account? Create one!" %}</p>
<p>
<a href="{% url 'registration' %}" class="link-info">
{% translate "Register" %}
Expand Down
11 changes: 7 additions & 4 deletions templates/registration/password_reset_confirm.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@

{% block login_content %}
{% if validlink %}
<h5>{% translate "Set a new password!" %}</h5>
<p class="text-start">{% translate "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
<h5>{% translate "Set new password!" %}</h5>
<p class="text-start">
{% translate "Please enter your new password twice." %}
</p>
<form method="POST" class="text-start">
{% csrf_token %}
{% bootstrap_field form.new_password1 show_label=False %}
Expand All @@ -21,7 +23,8 @@ <h5>{% translate "Set a new password!" %}</h5>
</form>
{% else %}
<h5>{% translate "Invalid link" %}</h5>
<p class="text-start">{% translate "The link for password recovery is invalid, likely because it has already been used. Please submit a new request for password recovery." %}</p>

<p class="text-start">
{% translate "The link for password recovery is invalid. It may have already been used or it has expired. Please submit a new request for password recovery." %}
</p>
{% endif %}
{% endblock login_content %}
10 changes: 6 additions & 4 deletions templates/registration/password_reset_done.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
{% load i18n %}

{% block bootstrap5_title %}
{% block title %}{% translate "E-mail sent" %}{% endblock %}
{% block title %}
{% translate "Email sent" %}
{% endblock %}
{% endblock %}

{% block login_content %}
<h5>{% translate "E-mail sent" %}</h5>
<h5>{% translate "Email sent" %}</h5>
<div class="text-start">
<p>{% translate 'We have sent you instructions to reset your password. Provided an account with the entered e-mail exists, you should receive it shortly.' %}</p>
<p>{% translate 'If you have not received an e-mail, please check if it is the e-mail address with which you registered or your spam folder.' %}</p>
<p>{% translate 'We have received your request to reset your password. Please check your email for a link to reset your password. The email should arrive within a few minutes.' %}</p>
<p>{% translate 'If you do not receive the email, please check your spam or junk folder. Please make sure it is the email address you have registered with.' %}</p>
</div>

{% endblock login_content %}
2 changes: 1 addition & 1 deletion templates/registration/password_reset_email.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}{% autoescape off %}
{% blocktranslate %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %}
{% blocktranslate %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %}

{% translate "Please go to the following page and set up a new password:" %}
{% block reset_link %}
Expand Down
4 changes: 2 additions & 2 deletions templates/registration/password_reset_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
{% endblock %}

{% block login_content %}
<h5>{% translate "Have you forgotten your password or username?" %}</h5>
<h5>{% translate "Have you forgotten your password?" %}</h5>
<p class="text-start">
{% translate 'Have you forgotten your password? Enter your e-mail address and we will send you instructions on how to set a new password.' %}
{% translate 'Forgot your password? Enter your email to receive reset instructions.' %}
</p>
<form method="POST">
{% csrf_token %}
Expand Down
4 changes: 2 additions & 2 deletions templates/registration/select_company.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
{% load i18n %}

{% block bootstrap5_title %}
{% trans "Select your company" %}
{% translate "Select company" %}
{% endblock %}

{% block login_content %}
<h5>{% translate "Your account is linked with multiple companies. Which one do you want to use?" %}</h5>
<h5>{% translate "Your account is linked to multiple companies. Select one to proceed." %}</h5>
<form method="POST">
{% csrf_token %}
{% bootstrap_field form.select_company show_label=False %}
Expand Down
16 changes: 8 additions & 8 deletions templates/regulator/incident_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ <h4>{{ _('Incident details')}}</h4>
: {{ incident.company_name }}
</div>
<div class="d-flex flex-row justify-content-left">
<span>{{ _('Incident notification datetime') }}</span>
<span>{{ _('Incident notification creation date') }}</span>
: {{ incident.preliminary_notification_date|date:'Y-m-d' }}
</div>
<div class="d-flex flex-row justify-content-left">
<span>{{ _('Final notification datetime') }}</span>
: {{ incident.final_notification_date|date:'Y-m-d' }}
</div>
<div class="d-flex flex-row justify-content-left">
<span>{{ _('Incident reference') }}</span>
<span>{{ _('Incident ID') }}</span>
: {{ incident.incident_reference }}
</div>
<div class="d-flex flex-row justify-content-left">
<span>{{ _('Police report reference') }}</span>
<span>{{ _('Criminal complaint file number') }}</span>
: {{ incident.complaint_reference }}
</div>
<div class="d-flex flex-row justify-content-left">
<span>{{ _('Is impact significant') }}</span>
<span>{{ _('Is impact significant?') }}</span>
: {% if incident.is_significative_impact %}{{ _('yes') }}{% else %}{{ _('no') }}{% endif %}
</div>

Expand All @@ -64,7 +64,7 @@ <h4>{{ _('Incident details')}}</h4>
<div class="d-flex flex-row justify-content-left">
{{ _('Last name') }}: {{ incident.contact_lastname }}</div>
<div class="d-flex flex-row justify-content-left">
{{ _('E-mail') }}: {{ incident.contact_email }}
{{ _('Email') }}: {{ incident.contact_email }}
</div>
<div class="d-flex flex-row justify-content-left">
{{ _('Phone number') }}: {{ incident.contact_telephone }}
Expand All @@ -83,22 +83,22 @@ <h4>{{ _('Incident details')}}</h4>
{{ _('Last name') }}: {{ incident.technical_lastname }}
</div>
<div class="d-flex flex-row justify-content-left">
{{ _('E-mail') }}: {{ incident.technical_email }}
{{ _('Email') }}: {{ incident.technical_email }}
</div>
<div class="d-flex flex-row justify-content-left">
{{ _('Phone number') }}: {{ incident.technical_telephone }}
</div>

<div class="d-flex flex-row justify-content-left">
<span class="bold">{{ _('Regulations') }}</span>
<span class="bold">{{ _('Legal bases') }}</span>
<ul>
{% for regulation in incident.regulations.all %}
<li>{{ regulation.label }}</li>
{% endfor %}
</ul>
</div>
<div class="d-flex flex-row justify-content-left">
<span class="bold">{{ _('Affected services') }}</span>
<span class="bold">{{ _('Impacted services') }}</span>
<ul>
{% for service in incident.affected_services.all %}
<li>{{ service.name }}</li>
Expand Down
2 changes: 1 addition & 1 deletion templates/report/contacts.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 id="incident_contacts" class="fw-bold">{% translate "Contact details" %}</h2
<th>{% translate "Title" %}</th>
<th>{% translate "First name" %}</th>
<th>{% translate "Last name" %}</th>
<th>{% translate "E-mail" %}</th>
<th>{% translate "Email" %}</th>
<th>{% translate "Phone number" %}</th>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion templates/report/cover.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h1 class="mt-5 mb-2 text-center fw-bold">{% translate "Incident notification re
</p>
<p>
<span class="fw-bold">
{% translate "Status" %}:
{% translate "Report status" %}:
</span>
{{ incident.get_incident_status_display }}
</p>
Expand Down
8 changes: 4 additions & 4 deletions templates/report/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ <h2 id="incident_details" class="fw-bold">
</tr>
<tr>
<th class="thead-light">
{% translate "Status" %}
{% translate "Report status" %}
</th>
<td>
{{ incident.get_incident_status_display }}
</td>
</tr>
<tr>
<th class="thead-light">
{% translate "Regulation" %}
{% translate "Legal basis" %}
</th>
<td>{{ incident.sector_regulation.regulation }}</td>
</tr>
Expand All @@ -34,7 +34,7 @@ <h2 id="incident_details" class="fw-bold">

<tr>
<th class="thead-light">
{% translate "Affected sectors" %}
{% translate "Impacted sectors" %}
</th>
<td>
{% for sector_name, subsectors in sectors.items %}
Expand Down Expand Up @@ -64,7 +64,7 @@ <h2 id="incident_details" class="fw-bold">
{% if incident.complaint_reference %}
<tr>
<th class="thead-light">
{% translate "Police report reference" %}
{% translate "Criminal complaint file number" %}
</th>
<td>
{{ incident.complaint_reference }}
Expand Down

0 comments on commit 3d35ca3

Please sign in to comment.