Merge branch 'fix-gpg-command' of salsa.debian.org:microjoe/nm.debian.org

MR: #41


Signed-off-by: Mattia Rizzolo <mattia@debian.org>

api/templates/api/doc.html

@@ -42,7 +42,7 @@ curl -H "Api-Key: YourAPIKeyValue" {% url 'api:status' %}
 which matches exactly, and 'fpr' which matches case insensitively at the end of
 the fingerprint.</p>
 
-<p>For cn, mn, sn, email and uid, you can use <tt>/value/</tt> to match with a
+<p>For cn, mn, sn, email and uid, you can use <code>/value/</code> to match with a
 case insensitive regular expression.</p>
 
 <p>Results will only contain an 'email' field if the request is made by
@@ -94,7 +94,7 @@ $ curl https://nm.debian.org/api/people?cn=/nric/
     <tbody>
     <tr><td>yes</td><td>status</td>
       <td>Get a list of all the people with the given status. You can use a
-        comma-separated list of statuses, like <tt>dd_nu,dd_u</tt>.</td></tr>
+        comma-separated list of statuses, like <code>dd_nu,dd_u</code>.</td></tr>
     <tr><td>no</td><td>person</td>
       <td>Get the status of the person with the given SSO username. You can use
         a comma-separated list of SSO usernames.</td></tr>

apikeys/templates/apikeys/keylist.html

@@ -16,7 +16,7 @@
   {% for k in keys %}
   <tr>
     <td>{{k.name}}</td>
-    <td><tt>{{k.value}}</tt></td>
+    <td><code>{{k.value}}</code></td>
     <td>{{k.enabled}}</td>
     <td>
       <form class="inline" method="POST" action="{% url 'apikeys:enable' pk=k.pk %}">{% csrf_token %}
@@ -64,8 +64,8 @@
     <td>{{l.ts|date:"Y-m-d H:i:s"}}</td>
     <td>{{l.key.name}}</td>
     <td>{{l.key_enabled}}</td>
-    <td><tt>{{l.remote_addr}}</tt></td>
-    <td><tt>{{l.request_method}} {{l.absolute_uri}}</tt></td>
+    <td><code>{{l.remote_addr}}</code></td>
+    <td><code>{{l.request_method}} {{l.absolute_uri}}</code></td>
   </tr>
   {% empty %}
   <tr><td colspan="5">No API key usage for {{user}}</td></tr>

dm/templates/dm/claim.html

@@ -14,7 +14,9 @@ fix this situation.</p>
 <p>Since you are logged in, I already know that your Single Sign-On username is
 <b>{{identity.subject}}</b>. The missing bit of information is who are you in the site,
 and I would like to find out using your GPG key. Please enter the fingerprint
-in this form (just the hexadecimal digits, as in <tt>gpg --fingerprint $YOUR_KEYID | sed -nre 's/Key fingerprint =//p'</tt>):</p>
+in this form (just the hexadecimal digits, as in:</p>
+
+<pre>LANG=en gpg --fingerprint $YOUR_KEYID | sed -nre 's/Key fingerprint =//p' | head -n1</pre>
 
 <form action="" method="POST">{% csrf_token %}
 {{form.as_p}}

fprs/templates/fprs/endorse_key.html

@@ -43,12 +43,12 @@ should be endorsed again with updated information.
 {% endblocktrans %}</p>
 
 <p>{% trans "Use the following command to create the signed statement:" %}<br>
-    <tt>gpg --clearsign --default-key {{ endorsing_fpr }}</tt></p>
+    <code>gpg --clearsign --default-key {{ endorsing_fpr }}</code></p>
 
 <p>{% trans "Handy command lines:" %}
 <ul>
-  <li><tt>gpg --clearsign --default-key {{endorsing_fpr}} | xclip</tt></li>
-  <li><tt>gpg --clearsign --default-key {{endorsing_fpr}} | xclip -selection clipboard</tt></li>
+  <li><code>gpg --clearsign --default-key {{endorsing_fpr}} | xclip</code></li>
+  <li><code>gpg --clearsign --default-key {{endorsing_fpr}} | xclip -selection clipboard</code></li>
 </ul>
 </p>
 
@@ -58,11 +58,11 @@ signed statement somewhere else.{% endblocktrans %}</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 %}
+<p>{% blocktrans with visitor=user.fullname%}The statement will be sent to <a href="https://lists.debian.org/debian-newmaint">debian-newmaint</a> as <code>{{visitor}}{% endblocktrans %}
     {% if "edit_email" in visit_perms %}
-      <a href="{% url 'person:edit_email' key=user.lookup_key %}">&lt;{{user.email}}&gt;</a></tt>.
+      <a href="{% url 'person:edit_email' key=user.lookup_key %}">&lt;{{user.email}}&gt;</a></code>.
     {% else %}
-      &lt;{{user.email}}&gt;</tt>.
+      &lt;{{user.email}}&gt;</code>.
     {% endif %}
 </p>
 

legacy/templates/legacy/process.html

@@ -54,7 +54,7 @@
     {% if "view_mbox" in visit_perms %}
     <tr><th>{% trans "Mail archive" %}</th>
         <td>
-            <tt><a href="mailto:{{process.archive_email}}">{{process.archive_email}}</a></tt>
+            <code><a href="mailto:{{process.archive_email}}">{{process.archive_email}}</a></code>
             {% if process.mailbox_file %}
             <a href="{% url 'legacy:download_mail_archive' key=process.lookup_key %}">{% trans "(download mail archive)" %}</a>
             <a href="{% url 'legacy:display_mail_archive' key=process.lookup_key %}">{% trans "(display mail archive)" %}</a>

locale/de/LC_MESSAGES/django.po

@@ -473,10 +473,10 @@ msgstr "Dies Signatur wird geprüft unter Benutzung des Schlüssels"
 #, python-format
 msgid ""
 "The statement will be sent to <a href=\"https://lists.debian.org/debian-"
-"newmaint\">debian-newmaint</a> as <tt>%(visitor)s"
+"newmaint\">debian-newmaint</a> as <code>%(visitor)s"
 msgstr ""
 "Diese Absichtserklärung wird an <a href=\"https://lists.debian.org/debian-"
-"newmaint\">debian-newmaint</a> geschickt als <tt>%(visitor)s"
+"newmaint\">debian-newmaint</a> geschickt als <code>%(visitor)s"
 
 #: fprs/templates/fprs/endorse_key.html:56
 #: minechangelogs/templates/minechangelogs/minechangelogs.html:30
@@ -771,13 +771,13 @@ msgstr "Wo bist Du?"
 #, python-format
 msgid ""
 "This\n"
-"sends out the last ping regarding the <tt>%(person_uid)s</tt> account of\n"
+"sends out the last ping regarding the <code>%(person_uid)s</code> account of\n"
 "<i>%(person_fullname)s</i>. The mail will contain links for becoming "
 "emeritus or\n"
 "notifying that one is still active."
 msgstr ""
-"Dieses Formular verschickt eine letzte Ping Nachricht an den Benutzer <tt>"
-"%(person_uid)s</tt> mit dem zugehörigem dem Account von <i>"
+"Dieses Formular verschickt eine letzte Ping Nachricht an den Benutzer <code>"
+"%(person_uid)s</code> mit dem zugehörigem dem Account von <i>"
 "%(person_fullname)s</i>. Die E-Mail enthält einen Link um den Emeritus "
 "Status zu erlangen als auch um Informationen um das WAT Team zu informieren "
 "das man noch aktiv ist."
@@ -1765,14 +1765,14 @@ msgid ""
 "On %(started_on)s the\n"
 "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">Missing In Action</"
 "a>\n"
-"team sent a \"Where Are Thou?\" ping message to <tt>%(person_ldap_uid)s</"
+"team sent a \"Where Are Thou?\" ping message to <code>%(person_ldap_uid)s</"
 "tt>\n"
 "communicating the intention of closing the account after some time."
 msgstr ""
 "Am %(started_on)s hat das\n"
 "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">Missing In Action</"
 "a>\n"
-"Team eine \"Where Are Thou?\" Ping Nachricht an <tt>%(person_ldap_uid)s</"
+"Team eine \"Where Are Thou?\" Ping Nachricht an <code>%(person_ldap_uid)s</"
 "tt>\n"
 "geschickt mit dem Hinweis auf die beabsichtigte Schließung des Accounts."
 
@@ -1902,7 +1902,7 @@ msgstr ""
 #, python-format
 msgid ""
 "The\n"
-"email will be sent as <tt>%(person_fullname)s &lt;%(person_email)s&gt;</"
+"email will be sent as <code>%(person_fullname)s &lt;%(person_email)s&gt;</"
 "tt>.\n"
 "You can change the address <a href=\"%(person_edit_email)s\">here</a>\n"
 "(requires <a href=\"https://wiki.debian.org/"
@@ -1910,8 +1910,8 @@ msgid ""
 "Debian Single SignOn</a> access)."
 msgstr ""
 "Die\n"
-"E-Mail wird mit der Identität <tt>%(person_fullname)s &lt;"
-"%(person_email)s&gt;</tt> gesendet.\n"
+"E-Mail wird mit der Identität <code>%(person_fullname)s &lt;"
+"%(person_email)s&gt;</code> gesendet.\n"
 "Du kannst die Adresse <a href=\"%(person_edit_email)s\">hier ändern</a>.\n"
 "(Benötigt <a href=\"https://wiki.debian.org/"
 "DebianSingleSignOn#Documentation_for_Users\">\n"
@@ -3862,18 +3862,18 @@ msgstr "Du bist bereits {0} und kannst nicht {1} werden."
 
 #, fuzzy
 #~| msgid ""
-#~| "Use <tt>gpg --clearsign --default-key %(visitor_fpr)s</tt>\n"
-#~| "to generate the signed statement. Tip: pipe it to <tt>xclip</tt> to have "
+#~| "Use <code>gpg --clearsign --default-key %(visitor_fpr)s</code>\n"
+#~| "to generate the signed statement. Tip: pipe it to <code>xclip</code> to have "
 #~| "it\n"
 #~| "copied to the clipboard for easy pasting."
 #~ msgid ""
-#~ "You can use <tt>gpg --clearsign --default-key %(endorsing_fpr)s</tt>\n"
+#~ "You can use <code>gpg --clearsign --default-key %(endorsing_fpr)s</code>\n"
 #~ "to generate the signed statement."
 #~ msgstr ""
-#~ "Benutze <tt>gpg --clearsign --default-key %(visitor_fpr)s</tt> um eine "
+#~ "Benutze <code>gpg --clearsign --default-key %(visitor_fpr)s</code> um eine "
 #~ "signierte Absichtserklärung\n"
 #~ "zu erstellen. Zusätzlicher Tipp: Leite die Ausgabe vom vorherigen Aufruf "
-#~ "an <tt>xclip</tt> weiter\n"
+#~ "an <code>xclip</code> weiter\n"
 #~ "um den Inhalt in die Zwischenablage zu übertragen. Dies ermöglicht ein "
 #~ "einfaches Einfügen in das\n"
 #~ "unten stehende Formular später."
@@ -3883,18 +3883,18 @@ msgstr "Du bist bereits {0} und kannst nicht {1} werden."
 
 #, fuzzy
 #~| msgid ""
-#~| "Use <tt>gpg --clearsign --default-key %(visitor_fpr)s</tt>\n"
-#~| "to generate the signed statement. Tip: pipe it to <tt>xclip</tt> to have "
+#~| "Use <code>gpg --clearsign --default-key %(visitor_fpr)s</code>\n"
+#~| "to generate the signed statement. Tip: pipe it to <code>xclip</code> to have "
 #~| "it\n"
 #~| "copied to the clipboard for easy pasting."
 #~ msgid ""
-#~ "Use <tt>gpg --clearsign --default-key %(visitor_fpr)s</tt>\n"
+#~ "Use <code>gpg --clearsign --default-key %(visitor_fpr)s</code>\n"
 #~ "to generate the signed statement."
 #~ msgstr ""
-#~ "Benutze <tt>gpg --clearsign --default-key %(visitor_fpr)s</tt> um eine "
+#~ "Benutze <code>gpg --clearsign --default-key %(visitor_fpr)s</code> um eine "
 #~ "signierte Absichtserklärung\n"
 #~ "zu erstellen. Zusätzlicher Tipp: Leite die Ausgabe vom vorherigen Aufruf "
-#~ "an <tt>xclip</tt> weiter\n"
+#~ "an <code>xclip</code> weiter\n"
 #~ "um den Inhalt in die Zwischenablage zu übertragen. Dies ermöglicht ein "
 #~ "einfaches Einfügen in das\n"
 #~ "unten stehende Formular später."

mia/templates/mia/miaping.html

@@ -6,7 +6,7 @@
 <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
+sends out the last ping regarding the <code>{{person_uid}}</code> account of
 <i>{{person_fullname}}</i>. The mail will contain links for becoming emeritus or
 notifying that one is still active.{% endblocktrans %}</p>
 

mia/templates/mia/miaremove.html

@@ -6,7 +6,7 @@
 <h1>Removal notice</h1>
 
 <p>This sends out a public notice to <i>debian-private</i> regarding the removal
-of the <tt>{{person.ldap_fields.uid}}</tt> account of <i>{{person.fullname}}</i>.  The mail
+of the <code>{{person.ldap_fields.uid}}</code> account of <i>{{person.fullname}}</i>.  The mail
 will contain instruction for stopping the removal procedure if anybody know
 something about <i>{{person.fullname}}</i>'s situation.</p>
 

process/templates/process/approve.html

@@ -8,13 +8,13 @@
 
 <table class="table table-sm">
   {% for key, value in rt_content %}
-  <tr><th>{{key}}</th><td><tt>{{value}}</tt></td></tr>
+  <tr><th>{{key}}</th><td><code>{{value}}</code></td></tr>
   {% endfor %}
 </table>
 
 <h2>{% trans "Unsigned statement" %}</h2>
 
-<p>{% trans "To sign the contents of the clipboard:" %} <br><tt>xclip -o | gpg --clearsign --default-key {{user.fpr}} | xclip</tt></p>
+<p>{% trans "To sign the contents of the clipboard:" %} <br><code>xclip -o | gpg --clearsign --default-key {{user.fpr}} | xclip</code></p>
 
 <textarea cols="80" rows="25">
 {{text|safe}}

process/templates/process/cancel.html

@@ -17,7 +17,7 @@ system. Follow the link for instructions.{% endblocktrans %}
 {% if process.applying_for == "dd_e" %} 
   <p>{% blocktrans with started_on=process.started|date:"F d, Y" person_ldap_uid=process.person.ldap_fields.uid %}On {{started_on}} the
 <a href="https://wiki.debian.org/qa.debian.org/MIATeam">Missing In Action</a>
-team sent a "Where Are Thou?" ping message to <tt>{{person_ldap_uid}}</tt>
+team sent a "Where Are Thou?" ping message to <code>{{person_ldap_uid}}</code>
 communicating the intention of closing the account after some time.{% endblocktrans %}</p>
   
   <p>{% blocktrans with person_fullname=person.fullname %}If you are {{person_fullname}} and consider

process/templates/process/emeritus.html

@@ -23,7 +23,7 @@ change it as you wish.{% endblocktrans %}
 <p>
 {% url 'person:edit_email' key=person.lookup_key as person_edit_email %}
 {% blocktrans with person_fullname=person.fullname person_email=person.email %}The
-email will be sent as <tt>{{person_fullname}} &lt;{{person_email}}&gt;</tt>.
+email will be sent as <code>{{person_fullname}} &lt;{{person_email}}&gt;</code>.
 You can change the address <a href="{{person_edit_email}}">here</a>
 (requires <a href="https://wiki.debian.org/DebianSingleSignOn#Documentation_for_Users">
 Debian Single SignOn</a> access).{% endblocktrans %}</p>

process/templates/process/show.html

@@ -91,7 +91,7 @@
   <tr>
     <th>{% trans "LDAP information" %}</th>
     <td>
-      <tt>cn={{person.ldap_fields.cn}}, mn={{person.ldap_fields.mn}}, sn={{person.ldap_fields.sn}}, email={{person.ldap_fields.email}}, uid={{person.ldap_fields.uid}}</tt>
+      <code>cn={{person.ldap_fields.cn}}, mn={{person.ldap_fields.mn}}, sn={{person.ldap_fields.sn}}, email={{person.ldap_fields.email}}, uid={{person.ldap_fields.uid}}</code>
       <a class="btn btn-sm btn-primary ml-2" href="{% url 'person:edit_ldap' key=person.lookup_key %}"><span class="fa fa-edit"></span> {% trans "Edit" %}</a>
     </td>
   </tr>
@@ -140,7 +140,7 @@
   <tr id="view_mbox">
     <th>{% trans "Mail archive" %}</th>
     <td>
-        <tt><a href="mailto:{{process.archive_email}}">{{process.archive_email}}</a></tt>
+        <code><a href="mailto:{{process.archive_email}}">{{process.archive_email}}</a></code>
         {% with process.current_am_assignment as am %}
         {% if am %}
         <a class="btn btn-sm btn-primary ml-2" href="mailto:{{process.archive_email}},{{person.email}},{{am.am.person.email}}"><span class="fa fa-envelope"></span> {% trans "Email applicant and AM" %}</a>

process/templates/process/statement_create.html

@@ -22,12 +22,12 @@ the need for manual verification of its content:{% endblocktrans %}</p>
 {% endif %}
 
 <p>{% trans "Use the following command to create the signed statement:" %}<br>
-    <tt>gpg --clearsign --default-key {{visitor_fpr}}</tt></p>
+    <code>gpg --clearsign --default-key {{visitor_fpr}}</code></p>
 
 <p>{% trans "Handy command lines:" %}
 <ul>
-  <li><tt>xclip -o | gpg --clearsign --default-key {{user.fpr}} | xclip</tt></li>
-  <li><tt>xclip -selection clipboard -o | gpg --clearsign --default-key {{user.fpr}} | xclip -selection clipboard</tt></li>
+  <li><code>xclip -o | gpg --clearsign --default-key {{user.fpr}} | xclip</code></li>
+  <li><code>xclip -selection clipboard -o | gpg --clearsign --default-key {{user.fpr}} | xclip -selection clipboard</code></li>
 </ul>
 </p>
 
@@ -38,11 +38,11 @@ signed statement somewhere else.{% endblocktrans %}</p>
 <p>{% blocktrans with fpr=user.fpr|fingerprint %}The signature will be verified using the key {{ fpr }}{% endblocktrans %}</p>
 
 {% if requirement.type != "sc_dmup" and requirement.type != "approval" %}
-<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 %}
+<p>{% blocktrans with visitor=user.fullname%}The statement will be sent to <a href="https://lists.debian.org/debian-newmaint">debian-newmaint</a> as <code>{{visitor}}{% endblocktrans %}
     {% if "edit_email" in visit_perms %}
-      <a href="{% url 'person:edit_email' key=user.lookup_key %}">&lt;{{user.email}}&gt;</a></tt>.
+      <a href="{% url 'person:edit_email' key=user.lookup_key %}">&lt;{{user.email}}&gt;</a></code>.
     {% else %}
-      &lt;{{user.email}}&gt;</tt>.
+      &lt;{{user.email}}&gt;</code>.
     {% endif %}
 </p>
 {% endif %}

process/tests/test_statements.py

@@ -190,7 +190,7 @@ v85pPGXRppmFCX/Pk+U=
             self.assertContains(
                     response,
                     'The statement will be sent to'
-                    ' <a href="https://lists.debian.org/debian-newmaint">debian-newmaint</a> as <tt>Dam')
+                    ' <a href="https://lists.debian.org/debian-newmaint">debian-newmaint</a> as <code>Dam')
             self.assertEqual(len(ops), 0)
 
         with self.collect_operations() as ops: