Move text to translations file

atst/models/task_order.py

@@ -116,13 +116,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):
 
     @property
     def native_apps_description(self):
-        # move all text into translations file!
+        if self.native_apps:
-        if self.native_apps == "yes":
+            return translate(
-            return "Yes, planning to develop natively in the cloud"
+                "task_orders.new.review.{}_native".format(self.native_apps)
-        elif self.native_apps == "no":
+            )
-            return "No, not planning to develop natively in the cloud"
-        elif self.native_apps == "not_sure":
-            return "Not sure, unsure if planning to develop natively in the cloud"
         else:
             return None
 

templates/task_orders/new/review.html

@@ -5,7 +5,7 @@
 {% from "components/icon.html" import Icon %}
 
 {% block heading %}
-  Review Your Task Order Info
+  {{ "task_orders.new.review.section_title"| translate }}
 {% endblock %}
 
 {% block form %}
@@ -18,42 +18,42 @@
 {% endif %}
 {% endmacro %}
 
-<h3 class="subheading">What are you building {{ TOEditLink(screen=1) }}</h3>
+<h3 class="subheading">{{ "task_orders.new.review.app_info"| translate }} {{ TOEditLink(screen=1) }}</h3>
 
 <div class="row">
   <div class="col col--grow">
-    <h4>Portfolio</h4>
+    <h4>{{ "task_orders.new.review.portfolio"| translate }}</h4>
     <p>{{ task_order.portfolio_name or RequiredLabel() }}</p>
   </div>
 
   <div class="col col--grow">
-    <h4>DoD Component</h4>
+    <h4>{{ "task_orders.new.review.dod"| translate }}</h4>
     <p>{{ task_order.defense_component or RequiredLabel() }}</p>
   </div>
 </div>
 
-<h4>Scope (Statement of Work)</h4>
+<h4>{{ "task_orders.new.review.scope"| translate }}</h4>
 <p>
 {{ task_order.scope or RequiredLabel() }}
 </p>
 
 <hr>
 
-<h3 class="subheading">Reporting {{ TOEditLink(screen=1) }}</h3>
+<h3 class="subheading">{{ "task_orders.new.review.reporting"| translate }} {{ TOEditLink(screen=1) }}</h3>
 
 <div class="row">
   <div class="col col--grow">
-    <h4>App Migration</h4>
+    <h4>{{ "task_orders.new.review.migration"| translate }}</h4>
     <p>{{ task_order.app_migration_description or RequiredLabel() }}</p>
   </div>
 
   <div class="col col--grow">
-    <h4>Native Apps</h4>
+    <h4>{{ "task_orders.new.review.native_apps"| translate }}</h4>
     <p>{{ task_order.native_apps_description or RequiredLabel() }}</p>
   </div>
 </div>
 
-<h4>Project Complextiy</h4>
+<h4>{{ "task_orders.new.review.complexity"| translate }}</h4>
 {% if task_order.complexity %}
   <ul class="checked-list">
   {% for item in task_order.complexity %}
@@ -67,7 +67,7 @@
 
 <div class="row">
   <div class="col col--grow">
-    <h4>Development Team</h4>
+    <h4>{{ "task_orders.new.review.team"| translate }}</h4>
     {% if task_order.dev_team %}
       <ul>
       {% for item in task_order.dev_team %}
@@ -81,44 +81,62 @@
   </div>
 
   <div class="col col--grow">
-    <h4>Team Experience</h4>
+    <h4>{{ "task_orders.new.review.experience"| translate }}</h4>
     <p>{{ task_order.team_experience_description or RequiredLabel() }}</p>
   </div>
 </div>
 
 <hr>
 
-<h3 class="subheading">Funding {{ TOEditLink(screen=2) }}</h3>
+<h3 class="subheading">{{ "task_orders.new.review.funding"| translate }} {{ TOEditLink(screen=2) }}</h3>
 
 <div class="row">
   <div class="col col--grow">
-    <h4>Period of Performance length</h4>
+    <h4>{{ "task_orders.new.review.performance_period"| translate }}</h4>
     {{ task_order.performance_length_description or RequiredLabel() }}
-    <p><a href="#" class='icon-link' download>{{ Icon('download') }} View Usasge Estimate</a></p>
+    <p><a href="#" class='icon-link' download>{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a></p>
   </div>
 
   <div class="col col--grow">
     <table class="funding-summary">
       <tbody>
         <tr>
-          <td><h4>Task Order Value</h4></td>
+          <td><h4>{{ "task_orders.new.review.to_value"| translate }}</h4></td>
           <td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.budget) }}</td>
         </tr>
         <tr>
-          <td><h4>CLIN #1 Unclassified Cloud</h4></td>
+          <td><h4>{{ "task_orders.new.review.clin_1"| translate }}</h4></td>
           <td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_01) }}</td>
         </tr>
         <tr>
-          <td><h4 class="inactive">CLIN #2 Classified Cloud<div>(Available soon)</div></h4></td>
+          <td><h4 {% if not config.CLASSIFIED %} class="inactive" {% endif %}>
-          <td class="table-cell--align-right"></td>
+            {{ "task_orders.new.review.clin_2"| translate }}
+            {% if not config.CLASSIFIED %}
+              <div>{{ "task_orders.new.review.classified_inactive"| translate }}</div>
+            {% endif %}
+          </h4></td>
+          <td class="table-cell--align-right">
+            {% if config.CLASSIFIED %}
+              {{ '${:,.2f}'.format(task_order.clin_02) }}
+            {% endif %}
+          </td>
         </tr>
         <tr>
-          <td><h4>CLIN #3 Unclassified Cloud</h4></td>
+          <td><h4>{{ "task_orders.new.review.clin_3"| translate }}</h4></td>
           <td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_03) }}</td>
         </tr>
         <tr>
-            <td><h4 class="inactive">CLIN #4 Classified Cloud<div>(Available soon)</div></h4></td>
+            <td><h4 {% if not config.CLASSIFIED %} class="inactive" {% endif %}>
-            <td class="table-cell--align-right"></td>
+              {{ "task_orders.new.review.clin_4"| translate }}
+              {% if not config.CLASSIFIED %}
+                <div>{{ "task_orders.new.review.classified_inactive"| translate }}</div>
+              {% endif %}
+            </h4></td>
+            <td class="table-cell--align-right">
+              {% if config.CLASSIFIED %}
+                {{ '${:,.2f}'.format(task_order.clin_04) }}
+              {% endif %}
+            </td>
         <tr>
       </tbody>
     </table>
@@ -127,46 +145,46 @@
 
 <hr>
 
-<h3 class="subheading">Oversight {{ TOEditLink(screen=3) }}</h3>
+<h3 class="subheading">{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(screen=3) }}</h3>
 
 <div class="row">
   <div class="col col--grow">
-    <h4>Contracting Officer (KO)</h4>
+    <h4>{{ "task_orders.new.review.ko"| translate }}</h4>
     {{ task_order.ko_first_name }} {{ task_order.ko_last_name }}<br>
     {{ task_order.ko_email }}<br>
     {{ task_order.ko_phone_number }}<br>
-    DoD ID: {{ task_order.ko_dod_id}}<br>
+    {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.ko_dod_id}}<br>
     {% if task_order.ko_invite %}
-      <span class="ok">{{ Icon('ok', classes='icon--ok') }} Invited</span>
+      <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>
     {% else %}
-      <span class="error">{{ Icon('alert', classes='icon--error') }} Not Yet Invited</span>
+      <span class="error">{{ Icon('alert', classes='icon--error') }} {{ "task_orders.new.review.not_invited"| translate }}</span>
     {% endif %}
   </div>
 
   <div class="col col--grow">
-    <h4>Contracting Officer Representative (COR)</h4>
+    <h4>{{ "task_orders.new.review.cor"| translate }}</h4>
     {{ task_order.cor_first_name }} {{ task_order.cor_last_name }}<br>
     {{ task_order.cor_email }}<br>
     {{ task_order.cor_phone_number }}<br>
-    DoD ID: {{ task_order.cor_dod_id}}<br>
+    {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.cor_dod_id}}<br>
     {% if task_order.cor_invite %}
-      <span class="ok">{{ Icon('ok', classes='icon--ok') }} Invited</span>
+      <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>
     {% else %}
-      <span class="error">{{ Icon('alert', classes='icon--error') }} Not Yet Invited</span>
+      <span class="error">{{ Icon('alert', classes='icon--error') }} {{ "task_orders.new.review.not_invited"| translate }}</span>
     {% endif %}
   </div>
 </div>
 <div class="row">
   <div class="col col--grow">
-    <h4>IA Security Officer</h4>
+    <h4>{{ "task_orders.new.review.so"| translate }}</h4>
     {{ task_order.so_first_name }} {{ task_order.so_last_name }}<br>
     {{ task_order.so_email }}<br>
     {{ task_order.so_phone_number }}<br>
-    DoD ID: {{ task_order.so_dod_id}}<br>
+    {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.so_dod_id}}<br>
     {% if task_order.so_invite %}
-      <span class="ok">{{ Icon('ok', classes='icon--ok') }} Invited</span>
+      <span class="ok">{{ Icon('ok', classes='icon--ok') }} {{ "task_orders.new.review.invited"| translate }}</span>
     {% else %}
-      <span class="error">{{ Icon('alert', classes='icon--error') }} Not Yet Invited</span>
+      <span class="error">{{ Icon('alert', classes='icon--error') }} {{ "task_orders.new.review.not_invited"| translate }}</span>
     {% endif %}
   </div>
 </div>

translations.yaml

@@ -425,6 +425,37 @@ task_orders:
       am_cor_label: I am the Contracting Officer Representative (COR) for this Task Order
       so_info_title: Security Officer Information
       so_info_paragraph: our Security Officer will need to answer some security configuration questions in order to generate a DD-254 document, then electronically sign.
+    review:
+      section_title: Review Your Task Order Info
+      app_info: What are you building
+      portfolio: Portfolio
+      dod: DoD Component
+      scope: Scope (Statement of Work)
+      reporting: Reporting
+      migration: App Migration
+      native_apps: Native Apps
+      yes_native: Yes, planning to develop natively in the cloud
+      no_native: No, not planning to develop natively in the cloud
+      not_sure_native: Not sure, unsure if planning to develop natively in the cloud
+      complexity: Project Complexity
+      team: Development Team
+      experience: Team Experience
+      funding: Funding
+      performance_period: Period of Performance length
+      usage_est_link: View Usage Estimate
+      to_value: Task Order Value
+      clin_1: 'CLIN #1: Unclassified Cloud'
+      clin_2: 'CLIN #2: Classified Cloud'
+      clin_3: 'CLIN #3: Unclassified Cloud'
+      clin_4: 'CLIN $4: Classified Cloud'
+      classified_inactive: (Available Soon)
+      oversight: Oversight
+      ko: Contracting Officer (KO)
+      cor: Contracting Officer Representative (COR)
+      so: IA Security Officer
+      dod_id: 'DoD ID:'
+      invited: Invited
+      not_invited: Not Yet Invited
 testing:
   example_string: Hello World
   example_with_variables: 'Hello, {name}!'