From 39b527dc4d91d72cbad2ffd726fe14e5446b8dc7 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 14 Jan 2019 18:13:57 -0500 Subject: [PATCH] Move text to translations file --- atst/models/task_order.py | 11 ++-- templates/task_orders/new/review.html | 86 ++++++++++++++++----------- translations.yaml | 31 ++++++++++ 3 files changed, 87 insertions(+), 41 deletions(-) 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 %} -

What are you building {{ TOEditLink(screen=1) }}

+

{{ "task_orders.new.review.app_info"| translate }} {{ TOEditLink(screen=1) }}

-

Portfolio

+

{{ "task_orders.new.review.portfolio"| translate }}

{{ task_order.portfolio_name or RequiredLabel() }}

-

DoD Component

+

{{ "task_orders.new.review.dod"| translate }}

{{ task_order.defense_component or RequiredLabel() }}

-

Scope (Statement of Work)

+

{{ "task_orders.new.review.scope"| translate }}

{{ task_order.scope or RequiredLabel() }}


-

Reporting {{ TOEditLink(screen=1) }}

+

{{ "task_orders.new.review.reporting"| translate }} {{ TOEditLink(screen=1) }}

-

App Migration

+

{{ "task_orders.new.review.migration"| translate }}

{{ task_order.app_migration_description or RequiredLabel() }}

-

Native Apps

+

{{ "task_orders.new.review.native_apps"| translate }}

{{ task_order.native_apps_description or RequiredLabel() }}

-

Project Complextiy

+

{{ "task_orders.new.review.complexity"| translate }}

{% if task_order.complexity %}