More opinionated language review

This is not simply fixing up spelling and grammar, but a full (ish)
review of English language strings and translation structure. This lays
the groundwork for a more formal translation round at a later date.

Some of the phrasing will inevitably be coloured by en_GB preference,
but I don't feel any shame about that.

backend/models.py

@@ -196,7 +196,7 @@ class Person(PermissionsMixin, models.Model):
     # First/Given name, or only name in case of only one name
     email = models.EmailField(_("email address"), null=False, unique=True)
     bio = models.TextField(_("short biography"), blank=True, null=False, default="",
-                           help_text=_("Please enter here a short biographical information"))
+                           help_text=_("The short biography may be visible on this site and published to a mailing list"))
 
     # Membership status
     status = models.CharField(_("current status in the project"), max_length=20, null=False,
@@ -210,7 +210,7 @@ class Person(PermissionsMixin, models.Model):
             help_text=_("This person will be deleted after this date if the status is still {} and"
                         " no Process has started").format(const.STATUS_DC))
     pending = models.CharField(_("Nonce used to confirm this pending record"), max_length=255, unique=False, blank=True)
-    last_vote = models.DateField(null=True, blank=True, help_text=_("date of the last vote done with this uid"))
+    last_vote = models.DateField(null=True, blank=True, help_text=_("date of the last vote done with this UID"))
 
     status_description = models.CharField(
             max_length=128, null=False, blank=True,

dsa/models.py

@@ -70,15 +70,15 @@ class LDAPFields(models.Model):
 
             if self.uid and self.uid.endswith("-guest"):
                 raise ValidationError({
-                    "uid": _("uid must not end in -guest"),
+                    "uid": _("UID must not end in '-guest'"),
                 })
             if self.uid and len(self.uid) < 3:
                 raise ValidationError({
-                    "uid": _("uid must be at least 3 characters long"),
+                    "uid": _("UID must be at least 3 characters long"),
                 })
             if self.uid and not self.uid.islower():
                 raise ValidationError({
-                    "uid": _("uid must be made of only lowercase characters"),
+                    "uid": _("UID must consist only of only lowercase letters and digits"),
                 })
             if self.uid and "." in self.uid:
                 raise ValidationError({
@@ -87,12 +87,12 @@ class LDAPFields(models.Model):
                 })
             if self.uid and self.uid in dam_forbidden_uids:
                 raise ValidationError({
-                    "uid": _("The requested uid is a system user or a well known alias,"
+                    "uid": _("The requested UID is a system user or a well known alias,"
                              " and cannot be used."),
                 })
             if self.uid and self.uid in dsa_forbidden_uids:
                 raise ValidationError({
-                    "uid": _("The requested uid is not accepted by DSA."
+                    "uid": _("The requested UID is not accepted by DSA."
                              " Contact debian-admin@lists.debian.org for details."),
                 })
 

fprs/templates/fprs/endorse_key.html

@@ -21,8 +21,8 @@ these interactions they relied on the endorsed key as their identity.{% endblock
 should be endorsed again with updated information.
 {% endblocktrans %}</p>
 
-<p>{% blocktrans %}You can use <tt>gpg --clearsign --default-key {{endorsing_fpr}}</tt>
-to generate the signed statement.{% endblocktrans %}<p>
+<p>{% trans "Use the following command to create the signed statement:" %}<br>
+    <tt>gpg --clearsign --default-key {{ endorsing_fpr }}</tt></p>
 
 <p>{% trans "Handy command lines:" %}
 <ul>
@@ -35,7 +35,7 @@ to generate the signed statement.{% endblocktrans %}<p>
 the date and nm.debian.org in the text, in case someone tries to reuse the
 signed statement somewhere else.{% endblocktrans %}</p>
 
-<p>{% trans "The signature will be verified using the key" %} {{endorsing_fpr|fingerprint}}.</p>
+<p>{% blocktrans with fpr=endorsing_fpr|fingerprint %}The signature will be verified using the key {{ fpr }}{% endblocktrans %}</p>
 
 <p>{% blocktrans with visitor=user.fullname%}The statement will be sent to <a href="https://lists.debian.org/debian-newmaint">debian-newmaint</a> as <tt>{{visitor}}{% endblocktrans %}
     {% if "edit_email" in visit_perms %}

fprs/templates/fprs/list.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Edit fingerprints for" %} {{person.fullname}}</h1>
+<h1>{% blocktrans with name=person.fullname %}Edit fingerprints for {{ name }}{% endblocktrans %}</h1>
 
 <form action="{% url 'fprs:person_list' key=person.lookup_key %}" method="post">{% csrf_token %}
   {% for hidden in form.hidden_fields %} {{hidden}} {% endfor %}

fprs/templates/fprs/view_endorsements.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Endorsements of "%}{{person.lookup_key}}{% trans "'s key" %} {{fpr | fingerprint}}</h1>
+<h1>{% blocktrans with person=person.lookup_key fpr=fpr|fingerprint %}Endorsements of {{ person }}'s key {{ fpr }}{% endblocktrans %}</h1>
 
 <table class="table table-sm">
   <thead>
@@ -19,10 +19,13 @@
     {% for e in endorsements %}
     <tr>
       <td>{{e.author.a_link}}</td>
-      <td>{{e.date|date:"Y-m-d"}}<br><small>({{e.date|timesince}} ago)</small></td>
+      <td>{{e.date|date:"Y-m-d"}}<br><small>({% blocktrans with time=e.date|timesince %}{{ time }} ago{% endblocktrans %})</small></td>
       <td>
         <pre class="inline-statement mb-0">{{e.text_clean}}</pre>
-        <small><i>{% if e.endorsing_fpr.fpr %}{% trans "Signed with key" %} {{e.endorsing_fpr.fpr|fingerprint}}{% else %}{% trans "Unsigned" %}{% endif %}</i></small>
+        <small><i>
+            {% if e.endorsing_fpr.fpr %}{% blocktrans with key=e.endorsing_fpr.fpr|fingerprint %}Signed with key {{ key }}{% endblocktrans %}
+            {% else %}{% trans "Unsigned" %}{% endif %}
+        </i></small>
       </td>
       <td>
         <a class="btn btn-sm btn-primary" href="{% url 'fprs:view_raw_endorsement' key=person.lookup_key fpr=fpr endorsement=e.pk %}">{% trans "View raw" %}</a>

legacy/templates/legacy/process.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Application status for" %} {{person.fullname}}</h1>
+<h1>{% blocktrans with name=person.fullname %}Application status for {{ name }}{% endblocktrans %}</h1>
 
 
 <h2>{% trans "Personal information" %}</h2>
@@ -26,7 +26,7 @@
     <tr>
       <th>{% trans "OpenPGP fingerprint" %}</th>
       <td>
-        {{fpr.fpr|fingerprint}}{% if "edit_fpr" in visit_perms %} (<a href="{% url 'fprs:person_list' key=person.lookup_key %}">{% trans "manage" %}</a>){% endif %}
+        {{fpr.fpr|fingerprint}}{% if "edit_fpr" in visit_perms %} (<a href="{% url 'fprs:person_list' key=person.lookup_key %}">{% trans "manage" context "verb; link to manage this person" %}</a>){% endif %}
         {% if fpr %}
         <small>
         <ul class="packed">

mia/templates/mia/miaping.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 
-<h1>{% trans "Where Art Thou?" %}</h1>
+<h1>{% trans "Where Art Thou?" context "Old English idiom meaning Where Are You?" %}</h1>
 
 <p>{% blocktrans with person_uid=person.ldap_fields.uid person_fullname=person.fullname %}This
 sends out the last ping regarding the <tt>{{person_uid}}</tt> account of

nmlayout/templates/403.html

 {% extends "nm2-base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans '403 Forbidden' %}{% endblock %}
+{% block title %}403 {% trans 'Forbidden' %}{% endblock %}
 
 {% block content %}
 
-<h2>{% trans '403 Forbidden' %}</h2>
+<h2>403 {% trans 'Forbidden' %}</h2>
 
-<p>{% trans "We're sorry, but the requested page is not allowed." %}</p>
+<p>{% trans "We're sorry, but access to the requested page is not allowed." %}</p>
 
 {% endblock %}

nmlayout/templates/index.html

@@ -26,11 +26,11 @@
         <p class="small mt-1">{% trans "Search people known to the site" %}</p>
       </li>
       <li class="list-group-item">
-        <a href="{% url 'members' %}"><span class="fa fa-certificate"></span> {% trans "Debian members" %}</a>
+        <a href="{% url 'members' %}"><span class="fa fa-certificate"></span> {% trans "Debian Members" %}</a>
         <p class="small mt-1">{% trans "Authoritative official list of Debian Members" %}</p>
       </li>
       <li class="list-group-item">
-        <a href="{% url 'public_newnm' %}"><span class="fa fa-user-plus"></span> {% trans "Apply" %}</a>
+        <a href="{% url 'public_newnm' %}"><span class="fa fa-user-plus"></span> {% trans "Apply" context "verb; apply for membership" %}</a>
         <p class="small mt-1">{% trans "Apply for a status change through the site" %}</p>
       </li>
     </ul>
@@ -101,7 +101,7 @@
       </li>
       <li class="list-group-item">
         <a href="https://salsa.debian.org/nm-team/nm.debian.org"><span class="fa fa-code"></span> {% trans "Development" %}</a>
-        <p class="small mt-1">{% trans "Gitlab project page for the site" %}</p>
+        <p class="small mt-1">{% trans "GitLab project page for the site" %}</p>
       </li>
       <li class="list-group-item">
         <a href="http://bugs.debian.org/nm.debian.org"><span class="fa fa-bug"></span> {% trans "Bugs" %}</a>

person/templates/person/edit_bio.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Edit short bio for" %} {{person.fullname}}</h1>
+<h1>{% blocktrans with name=person.fullname %}Edit short biography for {{ name }} {% endblocktrans %}</h1>
 
 <form action="" method="POST">{% csrf_token %}
 {% for field in form %}

person/templates/person/edit_email.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Edit email for" %} {{person.fullname}}</h1>
+<h1>{% blocktrans with name=person.fullname %}Edit email address for {{ name }} {% endblocktrans %}</h1>
 
 <form action="" method="POST">{% csrf_token %}
 <table class="personinfo">

person/templates/person/edit_ldap.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Edit LDAP information for" %} {{person.fullname}}</h1>
+<h1>{% blocktrans with name=person.fullname %}Edit LDAP information for {{ name }}{% endblocktrans %}</h1>
 
 <form action="" method="POST">{% csrf_token %}
 {% for field in form %}

process/mixins.py

@@ -108,7 +108,7 @@ def compute_process_status(process, visitor, visit_perms=None):
 
         if process.rt_ticket is not None:
             rt_link = mark_safe(f'<a href="https://rt.debian.org/{process.rt_ticket}">#{process.rt_ticket}</a>')
-            summary_text += _(" RT ticket: {}")
+            summary_text += " " + _("RT ticket: {}")
             summary_html = format_html(summary_text, approved_by_link, approved_time, rt_link)
         else:
             summary_html = format_html(summary_text, approved_by_link, approved_time)

process/models.py

@@ -147,20 +147,20 @@ class Process(models.Model):
     frozen_by = models.ForeignKey(
             bmodels.Person, related_name="+", blank=True, null=True,
             on_delete=models.PROTECT,
-            help_text=_("Person that froze this process for review, or NULL if it is still being worked on"))
+            help_text=_("Person who froze this process for review, or NULL if it is still being worked on"))
     frozen_time = models.DateTimeField(
             null=True, blank=True,
             help_text=_("Date the process was frozen for review, or NULL if it is still being worked on"))
     approved_by = models.ForeignKey(
             bmodels.Person, related_name="+", blank=True, null=True,
             on_delete=models.PROTECT,
-            help_text=_("Person that reviewed this process and considered it complete, or NULL if not yet reviewed"))
+            help_text=_("Person who reviewed this process and considered it complete, or NULL if not yet reviewed"))
     approved_time = models.DateTimeField(
             null=True, blank=True,
             help_text=_("Date the process was reviewed and considered complete, or NULL if not yet reviewed"))
     closed_by = models.ForeignKey(
             bmodels.Person, related_name="+", blank=True, null=True,
-            help_text=_("Person that closed this process, or NULL if still open"), on_delete=models.PROTECT)
+            help_text=_("Person who closed this process, or NULL if still open"), on_delete=models.PROTECT)
     closed_time = models.DateTimeField(null=True, blank=True, help_text=_(
         "Date the process was closed, or NULL if still open"))
     fd_comment = models.TextField(
@@ -370,7 +370,7 @@ class Requirement(models.Model):
     type = models.CharField(verbose_name=_(
         "Requirement type"), max_length=16, choices=REQUIREMENT_TYPES_CHOICES)
     approved_by = models.ForeignKey(bmodels.Person, null=True, blank=True, help_text=_(
-        "Set to the person that reviewed and approved this requirement"), on_delete=models.PROTECT)
+        "Set to the person who reviewed and approved this requirement"), on_delete=models.PROTECT)
     approved_time = models.DateTimeField(
         null=True, blank=True, help_text=_("When the requirement has been approved"))
 
@@ -616,7 +616,7 @@ class Requirement(models.Model):
             am = s.fpr.person.am_or_none
             if am is None or (am is not None and not (am.is_fd or am.is_dam)):
                 notes.append(("warn", _("statement uploaded by {}"
-                                        " who has no right to fill an approval requirement").format(
+                                        " who has no right to file an approval requirement").format(
                     s.fpr.person.lookup_key)))
                 continue
 

process/templates/process/amdashboard.html

@@ -82,17 +82,17 @@ table.inconsistency_table tbody {
 <h2 class="mt-3">{% trans "Application Manager" %}</h2>
 
 <p>{% blocktrans with visitor_uid=user.uid %}Hello <b>{{visitor_uid}}</b>,
-here is a list of New Member applicants that you are the AM for:{% endblocktrans %}</p>
+here is a list of New Member applicants who are assigned to you:{% endblocktrans %}</p>
 
 <h3 class="mt-3">{% trans "Applicants to process" %}</h3>
 
-<p>{% blocktrans %}The following applicants you are the AM for (ordered by the
+<p>{% blocktrans %}The following applicants are assigned to you (ordered by the
 date you accepted them as NMs):{% endblocktrans %}</p>
 {% include "process/process_list.html" with procs=am_prog_am skip_caption=True %}
 
 <h3 class="mt-3">{% trans "Applicants on Hold" %}</h3>
 
-<p>{% blocktrans %}Applicants who make it here have some issue with completing
+<p>{% blocktrans %}Applicants who appear here have some issue with completing
 the process but are expected to be able to work around that soon (ordered by
 hold date).{% endblocktrans %}</p>
 {% include "process/process_list.html" with progs=am_prog_hold skip_caption=True %}

process/templates/process/create.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>{% trans "Apply for a new status for" %} {{person}}</h1>
+<h1>{% blocktrans with person=person %}Apply for a new status for {{ person }}{% endblocktrans %}</h1>
 
 <p class="lead mt-3">{% blocktrans with person=person status=person|desc_status %}The current status of {{person}} is <b>{{status}}</b>.{% endblocktrans %}</p>
 

process/templates/process/explain_statement_advocate.html

@@ -49,8 +49,8 @@ months</a>. You can still advocate {{person_fullname}}, just please take a momen
 
 
 {% if edit %}
-<p>{% blocktrans %}Paste a signed advocacy message in the form below, and it will get
-automatically posted to <a href="https://lists.debian.org/debian-newmaint/">debian-newmaint</a>.
+<p>{% blocktrans %}Paste a signed advocacy message in the form below, and it will
+automatically be posted to <a href="https://lists.debian.org/debian-newmaint/">debian-newmaint</a>.
 (Note: The message needs to be written in English.){% endblocktrans %}</p>
 
 <p>{% trans "An example advocacy message intent can be something like this:" %}

process/templates/process/explain_statement_am_ok.html

@@ -7,7 +7,7 @@ a look at all the information collected on this site, has a look to past contrib
 asks a few questions if needed, and tries to build some trust that {{person_fullname}}
 should indeed be {{process_applying_for_desc}}.{% endblocktrans %}</p>
 
-<p>{% trans "The applicant will be notified once an Application Manager is assigned who will contact them." %}</p>
+<p>{% trans "The applicant will be notified once an Application Manager is assigned, and the AM will contact them." %}</p>
 
 {% if edit %}
 <p>{% blocktrans with person_fullname=person.fullname %}As the Application Manager,

process/templates/process/explain_statement_approval.html

@@ -2,21 +2,21 @@
 {% load nm %}
 
 {% if edit and not process.frozen %}
-<p class="alert alert-warning" role="alert">{% blocktrans %}Approving a process without having frozen it before is not
-a good idea.{% endblocktrans %}</p>
+<p class="alert alert-warning" role="alert">{% blocktrans %}Approving a process without having first frozen it is not
+recommended.{% endblocktrans %}</p>
 {% endif %}
 
 <p>{% blocktrans with person_get_absolute_url=person.get_absolute_url process_applying_for_desc=process.applying_for|desc_status %}This page lists the approval statements for
    <a href="{{person_get_absolute_url}}">{{person}}</a>
    to become <i>{{process_applying_for_desc}}</i>. Only statements from
    FrontDesk and Debian Account Managers are valid for this requirement to be
-   satisfied. Usually, this requirement is filled last, after the rest of the
+   satisfied. Usually, this requirement is completed last, after the rest of the
    process is done.{% endblocktrans %}</p>
 
 {% if process.applying_for == "dd_nu" or process.applying_for == "dd_u" %}
 {% if not user.am.is_dam and not user.am.is_fd  %}
 <p>{% blocktrans %}This process being for {{person}} to become a Debian Developer, if the
-approval is made by a FrontDesk Member, it won't become effective immediately.
+approval is made by a FrontDesk Member it won't become effective immediately.
 A grace period of 7 days will be observed before the process going further (RT
 ticket submission for the keyring changes and account creation).{% endblocktrans %}</p>
 {% else %}
@@ -39,8 +39,8 @@ text:{% endblocktrans %}
 
 {% if process.applying_for == "dd_nu" or process.applying_for == "dd_u" %}
 {% if not user.am.is_dam %}
-{% blocktrans %}Note that the RT ticket associated with this approval won't be sent before a
-week as you're approving a DD process and not a DAM member.{% endblocktrans %}
+{% blocktrans %}Note that the RT ticket associated with this approval won't be sent for 7
+days (the Front Desk grace period).{% endblocktrans %}
 {% endif %}
 {% endif %}
 </p>

process/templates/process/explain_statement_sc_dmup.html

@@ -3,13 +3,13 @@
 <p>{% blocktrans %}Every Debian Contributor, to gain access to project resources, needs to know
 and agree with these documents:{% endblocktrans%}
 <dl>
-  <dt><a href="https://www.debian.org/social_contract">{% trans "Debian Social Contract" %}</a> {% trans "(SC)" %}</dt>
+  <dt><a href="https://www.debian.org/social_contract">{% trans "Debian Social Contract (SC)" %}</a></dt>
   <dd>{% trans "Defines the common principles for all work in Debian" %}</dd>
-  <dt><a href="https://www.debian.org/social_contract#guidelines">{% trans "Debian Free Software Guidelines" %}</a> {% trans "(DFSG)" %}</dt>
-  <dd>{% trans "Defines what is Free Software for Debian" %}</dd>
-  <dt><a href="https://www.debian.org/code_of_conduct">{% trans "Debian Code of Conduct" %}</a> {% trans "(CoC)" %}</dt>
+  <dt><a href="https://www.debian.org/social_contract#guidelines">{% trans "Debian Free Software Guidelines (DFSG)" %}</a></dt>
+  <dd>{% trans "Defines what Free Software means for Debian" %}</dd>
+  <dt><a href="https://www.debian.org/code_of_conduct">{% trans "Debian Code of Conduct (CoC)" %}</a></dt>
   <dd>{% trans "Defines expectations for communication and behaviour within the Debian community" %}</dd>
-  <dt><a href="https://www.debian.org/devel/dmup">{% trans "Debian Machine Usage Policies" %}</a> {% trans "(DMUP)" %}</dt>
+  <dt><a href="https://www.debian.org/devel/dmup">{% trans "Debian Machine Usage Policies (DMUP)" %}</a></dt>
   <dd>{% trans "Defines the rules for accessing Debian machines" %}</dd>
 </dl>
 </p>
@@ -19,6 +19,6 @@ require a signed statement of agreement for each key that is used in the
 project.{% endblocktrans%}</p>
 
 {% if edit %}
-<p>{% blocktrans %}This page allows to manage the agreements automatically. To add or change
+<p>{% blocktrans %}This page allows the agreements to be managed automatically. To add or change
 the signed agreement to SC/DFSG/DMUP, paste it in the form below.{% endblocktrans%}</p>
 {% endif %}