From 0fcd5a6471bb2bfe08cbc260eb807adc5d01de55 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 23 Jan 2020 14:34:43 -0500
Subject: [PATCH] Move text into translations file and fix formatting to make
 file more readable

---
 .../applications/fragments/environments.html  | 30 ++++++++++++++-----
 translations.yaml                             |  7 ++++-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/templates/applications/fragments/environments.html b/templates/applications/fragments/environments.html
index 5f92e6aa..51cad0fc 100644
--- a/templates/applications/fragments/environments.html
+++ b/templates/applications/fragments/environments.html
@@ -17,7 +17,7 @@
     {% if 0 == environments_obj | length -%}
       <div class="empty-state panel__content">
         <p class="empty-state__message">
-          This Application has no environments
+          {{ 'portfolios.applications.environments.blank_slate' | translate }}
         </p>
       </div>
     {% else %}
@@ -43,7 +43,7 @@
                         )
                       }}
                       {% if user_can(permissions.EDIT_ENVIRONMENT) -%}
-                        {% set edit_environment_button = "Edit" %}
+                        {% set edit_environment_button = "common.edit"|translate %}
                         {{
                         ToggleButton(
                           open_html=edit_environment_button,
@@ -56,8 +56,15 @@
                       {% if env['pending'] -%}
                         {{ Label(type="changes_pending", classes='label--below')}}
                       {% else %}
-                        <a href='{{ url_for("applications.access_environment", environment_id=env.id)}}' target='_blank' rel='noopener noreferrer' class='application-list-item__environment__csp_link'>
-                          <span>{{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }}</span>
+                        <a
+                          href='{{ url_for("applications.access_environment", environment_id=env.id)}}'
+                          target='_blank'
+                          rel='noopener noreferrer'
+                          class='application-list-item__environment__csp_link'>
+                          <span>
+                            {{ "portfolios.applications.csp_link" | translate }}
+                            {{ Icon('link', classes="icon--tiny") }}
+                          </span>
                         </a>
                       {%- endif %}
                     </div>
@@ -66,7 +73,7 @@
                   {% call ToggleSection(section_name="members") %}
                     <ul>
                       {% for member in env['members'] %}
-                      {% set status = ": Access Suspended" if member['status'] == 'disabled' %}
+                      {% set status = "portfolios.applications.environments.disabled"|translate if member['status'] == 'disabled' %}
                       <li class="accordion-table__item-toggle-content__expanded">
                         {{ member['user_name'] }}{{ status }}
                       </li>
@@ -79,7 +86,11 @@
                       <ul>
                         <li class="accordion-table__item-toggle-content__expanded">
                           <base-form inline-template>
-                            <form action="{{ url_for('applications.update_environment', environment_id=env['id']) }}" method="post" v-on:submit="handleSubmit" class="col col--half">
+                            <form
+                              action="{{ url_for('applications.update_environment', environment_id=env['id']) }}"
+                              method="post"
+                              v-on:submit="handleSubmit"
+                              class="col col--half">
                               {{ edit_form.csrf_token }}
                               {{ TextInput(edit_form.name, validation='defaultStringField', optional=False) }}
                               <div class="action-group action-group--tight">
@@ -89,7 +100,12 @@
                                   )
                                 }}
                               </div>
-                              <button type="submit" formaction="{{ url_for('applications.create_subscription', environment_id=env.id)}}" class="usa-button usa-button-secondary">Add new subscription</button>
+                              <button
+                                type="submit"
+                                formaction="{{ url_for('applications.create_subscription', environment_id=env.id)}}"
+                                class="usa-button usa-button-secondary">
+                                {{ "portfolios.applications.environments.add_subscription" | translate }}
+                              </button>
                             </form>
                           </base-form>
                         </li>
diff --git a/translations.yaml b/translations.yaml
index c6d3dbbc..27e5805d 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -46,6 +46,7 @@ common:
   delete_confirm: "Please type the word {word} to confirm:"
   dod_id: DoD ID
   disable: Disable
+  edit: Edit
   email: Email
   lorem: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
   name: Name
@@ -409,9 +410,13 @@ portfolios:
     create_new_env_info: Creating an environment gives you access to the Cloud Service Provider. This environment will function within the constraints of the task order, and any costs will be billed against the portfolio.
     csp_link: Cloud Service Provider Link
     enter_env_name: "Enter environment name:"
+    environments:
+      add_subscription: Add new subscription
+      blank_slate: This Application has no environments
+      disabled: ": Access Suspended"
     environments_heading: Application Environments
     existing_application_title: "{application_name} Application Settings"
-    member_count: "{count} members"
+    member_count: "{count} Members"
     new_application_title: New Application
     settings:
       name_description: Application name and description