diff --git a/atst/models/task_order.py b/atst/models/task_order.py index fffab232..a6262e13 100644 --- a/atst/models/task_order.py +++ b/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 == "yes": - return "Yes, planning to develop natively in the cloud" - 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" + if self.native_apps: + return translate( + "task_orders.new.review.{}_native".format(self.native_apps) + ) else: return None diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html index a77d01b9..e5e89ad3 100644 --- a/templates/task_orders/new/review.html +++ b/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 %} -
{{ task_order.portfolio_name or RequiredLabel() }}
{{ task_order.defense_component or RequiredLabel() }}
{{ task_order.scope or RequiredLabel() }}
{{ task_order.app_migration_description or RequiredLabel() }}
{{ task_order.native_apps_description or RequiredLabel() }}
{{ task_order.team_experience_description or RequiredLabel() }}
{{ Icon('download') }} View Usasge Estimate
+{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}
Task Order Value |
+ {{ "task_orders.new.review.to_value"| translate }} |
{{ '${:,.2f}'.format(task_order.budget) }} | |
CLIN #1 Unclassified Cloud |
+ {{ "task_orders.new.review.clin_1"| translate }} |
{{ '${:,.2f}'.format(task_order.clin_01) }} | |
CLIN #2 Classified Cloud |
- + |
+ {{ "task_orders.new.review.clin_2"| translate }}
+ {% if not config.CLASSIFIED %}
+ |
+ + {% if config.CLASSIFIED %} + {{ '${:,.2f}'.format(task_order.clin_02) }} + {% endif %} + |
CLIN #3 Unclassified Cloud |
+ {{ "task_orders.new.review.clin_3"| translate }} |
{{ '${:,.2f}'.format(task_order.clin_03) }} | |
CLIN #4 Classified Cloud |
- + |
+ {{ "task_orders.new.review.clin_4"| translate }}
+ {% if not config.CLASSIFIED %}
+ |
+ + {% if config.CLASSIFIED %} + {{ '${:,.2f}'.format(task_order.clin_04) }} + {% endif %} + |