Move text into translations file

templates/ccpo/add_user.html

@@ -5,7 +5,7 @@
 {% block content %}
   <form id="add-ccpo-user-form" action="{{ url_for('ccpo.submit_add_new_ccpo_user') }}" method="POST">
     {{ form.csrf_token }}
-    <h1>Add new CCPO user</h1>
+    <h1>{{ "ccpo.form.add_user_title" | translate }}</h1>
     <div class='form-row'>
       <div class='form-col form-col--two-thirds'>
         {{ TextInput(form.dod_id, validation='dodId') }}
@@ -16,7 +16,7 @@
               type='submit'
               v-bind:disabled="invalid"
               class='action-group__action usa-button'
-              value='Next'>
+              value='{{ "common.next" | translate }}'>
           <a class='action-group__action icon-link icon-link--default' href="{{ url_for('ccpo.ccpo_users') }}">{{ "common.cancel" | translate }}</a>
         </div>
       </div>

templates/ccpo/confirm_user.html

@@ -5,13 +5,13 @@
 
 {% block content %}
   {% if new_user %}
-    {% call Alert('Confirm new CCPO user') %}
+    {% call Alert('ccpo.form.confirm_user_title' | translate) %}
       <form id="add-ccpo-user-form" action="{{ url_for('ccpo.confirm_new_ccpo_user') }}" method="POST">
         {{ form.csrf_token }}
         <input type="hidden" name="dod_id" value="{{ form.dod_id.data }}">
         <div>
           <p>
-            Please confirm that the user details below match the user being given CCPO permissions.
+            {{ "ccpo.form.confirm_user_text" | translate }}
           </p>
           <p>
             {{ new_user.full_name }}
@@ -25,17 +25,21 @@
               type='submit'
               v-bind:disabled="invalid"
               class='action-group__action usa-button'
-              value='Confirm and Add User'>
-          <a class='action-group__action icon-link icon-link--default' href="{{ url_for('ccpo.ccpo_users') }}">{{ "common.cancel" | translate }}</a>
+              value='{{ "ccpo.form.confirm_button" | translate }}'>
+          <a class='action-group__action icon-link icon-link--default' href="{{ url_for('ccpo.ccpo_users') }}">
+            {{ "common.cancel" | translate }}
+          </a>
         </div>
       </form>
     {% endcall %}
   {% else %}
-    {% call Alert('forms.ccpo_user.user_not_found' | translate) %}
-      To add someone as a CCPO user, they must already have an ATAT account.
+    {% call Alert('ccpo.form.user_not_found_title' | translate) %}
+      <p>
+        {{ "ccpo.form.user_not_found_text" | translate }}
+      </p>
       <div class='action-group'>
         <a class='action-group__action icon-link icon-link--default' href="{{ url_for('ccpo.ccpo_users') }}">
-          Return to list of CCPO users
+          {{ "ccpo.form.return_link" | translate }}
         </a>
       </div>
     {% endcall %}

templates/ccpo/users.html

@@ -5,7 +5,7 @@
 {% block content %}
   <div class='col'>
     <div class="h2">
-      CCPO Users
+      {{ "ccpo.users_title" | translate }}
     </div>
 
     {% include "fragments/flash.html" %}
@@ -13,9 +13,9 @@
     <table>
       <thead>
         <tr>
-          <th>Name</th>
-          <th>Email</th>
-          <th>DoD ID</th>
+          <th>{{ "ccpo.name_heading" | translate }}</th>
+          <th>{{ "ccpo.email_heading" | translate }}</th>
+          <th>{{ "ccpo.dod_id_heading" | translate }}</th>
         </tr>
       </thead>
       <tbody>
@@ -32,7 +32,7 @@
 
   {% if user_can(permissions.CREATE_CCPO_USER) %}
     <a class="icon-link modal-link" href="{{ url_for('ccpo.add_new_ccpo_user')}}">
-      Add new CCPO user {{ Icon("plus") }}
+      {{ "ccpo.add_user" | translate }} {{ Icon("plus") }}
     </a>
   {% endif %}
 

tests/routes/test_ccpo.py

@@ -28,7 +28,7 @@ def test_submit_add_new_ccpo_user(user_session, client):
     response = client.post(
         url_for("ccpo.submit_add_new_ccpo_user"), data={"dod_id": random_dod_id}
     )
-    assert translate("forms.ccpo_user.user_not_found") in response.data.decode()
+    assert translate("ccpo.form.user_not_found_title") in response.data.decode()
 
 
 def test_confirm_new_ccpo_user(user_session, client):

translations.yaml

@@ -26,6 +26,20 @@ home:
   applications_descrip: ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
   reports_descrip: enim ad minim veniam, quis nostrud exercitation ullamco
   admin_descrip: aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+ccpo:
+  users_title: CCPO Users
+  name_heading: Name
+  email_heading: Email
+  dod_id_heading: DoD ID
+  add_user: Add new CCPO user
+  form:
+    add_user_title: Add new CCPO user
+    confirm_user_title: Confirm new CCPO user
+    confirm_user_text: Please confirm that the user details below match the user being given CCPO permissions.
+    confirm_button: Confirm and Add User
+    return_link: Return to list of CCPO users
+    user_not_found_title: User not found
+    user_not_found_text: To add someone as a CCPO user, they must already have an ATAT account.
 common:
   cancel: Cancel
   close: Close
@@ -36,6 +50,7 @@ common:
   delete_confirm: 'Please type the word {word} to confirm:'
   edit: Edit
   members: Members
+  next: Next
   'yes': 'Yes'
   'no': 'No'
   response_label: Response required
@@ -103,8 +118,6 @@ forms:
     name_label: Name
   assign_ppoc:
     dod_id: 'Select new primary point of contact:'
-  ccpo_user:
-    user_not_found: "User not found"
   environments:
     name_label: Environment Name
   edit_user: