From d6116a2740109d8728ff5c38b0fe30bb9b72bb86 Mon Sep 17 00:00:00 2001
From: Cory Francis Myers <cory@freedom.press>
Date: Tue, 27 Jul 2021 11:59:12 -0700
Subject: [PATCH] addresses review feedback

Adds explicit title-case ARIA-LABEL attributes to elements whose strings
are in all caps to support idiomatic translation (cf. #5821, #6003).

thread: https://github.com/freedomofpress/securedrop/pull/6041#discussion_r673878829
---
 securedrop/source_templates/base.html     | 2 +-
 securedrop/source_templates/generate.html | 2 +-
 securedrop/source_templates/index.html    | 4 ++--
 securedrop/source_templates/login.html    | 4 ++--
 securedrop/source_templates/logout.html   | 2 +-
 securedrop/source_templates/lookup.html   | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/securedrop/source_templates/base.html b/securedrop/source_templates/base.html
index f309e4514d..bfb75f8115 100644
--- a/securedrop/source_templates/base.html
+++ b/securedrop/source_templates/base.html
@@ -37,7 +37,7 @@ <h1>{{ gettext("We're sorry, our SecureDrop is currently offline.") }}</h1>
 
           {% if 'logged_in' in session %}
             <nav>
-              <a href="{{ url_for('main.logout') }}" class="btn pull-right" id="logout">{{ gettext('LOG OUT') }}</a>
+              <a href="{{ url_for('main.logout') }}" class="btn pull-right" id="logout" aria-label="{{ gettext('Log Out') }}">{{ gettext('LOG OUT') }}</a>
             </nav>
           {% endif %}
 
diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html
index 310f39f12a..afd694459f 100644
--- a/securedrop/source_templates/generate.html
+++ b/securedrop/source_templates/generate.html
@@ -28,7 +28,7 @@ <h1>{{ gettext('Welcome') }}</h1>
 <form id="create-form" method="post" action="/create" autocomplete="off">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
   <input name="tab_id" type="hidden" value="{{ tab_id }}">
-  <button type="submit" class="btn--space pull-right" id="continue-button">
+  <button type="submit" class="btn--space pull-right" id="continue-button" aria-label="{{ gettext('Submit Documents') }}">
      {{ gettext('SUBMIT DOCUMENTS') }}
   </button>
 </form>
diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html
index fd3bd2038a..622e1a3509 100644
--- a/securedrop/source_templates/index.html
+++ b/securedrop/source_templates/index.html
@@ -61,7 +61,7 @@ <h2 id="first-submission-heading" class="welcome-text">
               <p class="extended-welcome-text">{{ gettext('First time submitting to our SecureDrop? Start here.') }}</p>
               </div>
               <div class="index-column-bottom-container" aria-label="">
-                <a href="{{ url_for('main.generate') }}" id="submit-documents-button" class="btn alt">
+                <a href="{{ url_for('main.generate') }}" id="submit-documents-button" class="btn alt" aria-label="{{ gettext('Get Started') }}">
                   {{ gettext('GET STARTED') }}
                 </a>
               </div>
@@ -75,7 +75,7 @@ <h2 id="return-visit-heading" class="welcome-text">
               <p class="extended-welcome-text">{{ gettext('Already have a codename? Check for replies or submit something new.') }}</p>
               </div>
               <div class="index-column-bottom-container">
-                <a href="{{ url_for('main.login') }}" id="login-button" class="btn secondary">
+                <a href="{{ url_for('main.login') }}" id="login-button" class="btn secondary" aria-label="{{ gettext('Log In') }}">
                   {{ gettext('LOG IN') }}
                 </a>
               </div>
diff --git a/securedrop/source_templates/login.html b/securedrop/source_templates/login.html
index c758e40500..7f6b6d7907 100644
--- a/securedrop/source_templates/login.html
+++ b/securedrop/source_templates/login.html
@@ -24,10 +24,10 @@ <h1>{{ gettext('Enter Codename') }}</h1>
   </div>
 
 <div class="pull-right section-spacing">
-  <button type="submit" id="login">
+  <button type="submit" id="login" aria-label="{{ gettext('Continue') }}">
     {{ gettext('CONTINUE') }}
   </button>
-  <a href="{{ url_for('main.index') }}" class="btn secondary" id="cancel">
+  <a href="{{ url_for('main.index') }}" class="btn secondary" id="cancel" aria-label="{{ gettext('Cancel') }}">
     {{ gettext('CANCEL') }}</a>
 </div>
 
diff --git a/securedrop/source_templates/logout.html b/securedrop/source_templates/logout.html
index dcdf020716..5fcab4f7e0 100644
--- a/securedrop/source_templates/logout.html
+++ b/securedrop/source_templates/logout.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block body %}
   <nav>
-    <a href="{{ url_for('main.login') }}" class="btn pull-right"> {{ gettext('LOG IN') }}</a>
+    <a href="{{ url_for('main.login') }}" class="btn pull-right" aria-label="{{ gettext('Log In') }}"> {{ gettext('LOG IN') }}</a>
   </nav>
   <section>
   <h1>{{ gettext('One more thing...') }}</h1>
diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html
index 6bc27de258..da3d3931b0 100644
--- a/securedrop/source_templates/lookup.html
+++ b/securedrop/source_templates/lookup.html
@@ -54,13 +54,13 @@ <h2 id="submit-heading" class="headline">{{ gettext('Submit Messages') }}</h2>
   </div>
 
   <div class="pull-right section-spacing">
-    <button type="submit" id="submit-doc-button">
+    <button type="submit" id="submit-doc-button" aria-label="{{ gettext('Submit') }}">
       {{ gettext('SUBMIT') }}
     </button>
 
 
 
-    <a href="{{ url_for('main.lookup') }}" class="btn secondary" id="cancel">
+    <a href="{{ url_for('main.lookup') }}" class="btn secondary" id="cancel" aria-label="{{ gettext('Cancel') }}">
       {{ gettext('CANCEL') }}
     </a>
   </div>
@@ -88,7 +88,7 @@ <h2 id="replies-heading" class="headline">{{ gettext('Read Replies') }}</h2>
             <h3 id="delete-heading-{{ reply.filename }}" hidden>Delete reply from {{ reply.date|rel_datetime_format(relative=True) }}?</h3>
             <p>{{ gettext('Delete this reply?') }}
               <a href="#delete">{{ gettext('Cancel') }}</a>
-              <button type="submit" class="danger" id="confirm-delete-reply-button-{{ reply.filename }}">{{ gettext('DELETE') }}</button>
+              <button type="submit" class="danger" id="confirm-delete-reply-button-{{ reply.filename }}" aria-label="{{ gettext('Delete') }}>{{ gettext('DELETE') }}</button>
             </p>
           </dialog>
         </form>
@@ -96,7 +96,7 @@ <h3 id="delete-heading-{{ reply.filename }}" hidden>Delete reply from {{ reply.d
       </article>
     {% endfor %}
     <form id="delete-all" method="post" action="{{ url_for('main.batch_delete') }}">
-      <a class="btn danger" href="#delete-all-confirm">{{ gettext('DELETE ALL REPLIES') }}</a>
+      <a class="btn danger" href="#delete-all-confirm" aria-label="{{ gettext('Delete All Replies') }}">{{ gettext('DELETE ALL REPLIES') }}</a>
       <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
       <dialog open id="delete-all-confirm" class="hidden-prompt" aria-labelledby="delete-all-heading">
         <h3 id="delete-all-heading">{{ gettext('Are you finished with the replies?') }}</h3>