From 961717e0e7dd7a5111dfedeef174be6286469638 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 07:37:15 -0500 Subject: [PATCH] Update copy in TO builder --- js/components/clin_fields.js | 2 +- templates/components/clin_fields.html | 2 +- .../fragments/task_order_view.html | 10 +++++----- templates/task_orders/step_1.html | 4 ++-- templates/task_orders/step_5.html | 2 +- translations.yaml | 19 ++++++++++++++----- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 327bedf0..a43d321f 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -101,7 +101,7 @@ export default { if (!!this.clinNumber) { return `CLIN ${this.clinNumber}` } else { - return `CLIN` + return `New CLIN` } }, percentObligated: function() { diff --git a/templates/components/clin_fields.html b/templates/components/clin_fields.html index 64dbb86c..81e31f9a 100644 --- a/templates/components/clin_fields.html +++ b/templates/components/clin_fields.html @@ -118,7 +118,7 @@ {{ CLINDollarAmount("obligated", funding_validation=True) }} {% endif %} -
Percent Obligated
+
{{ "task_orders.form.step_3.percent_obligated" | translate }}

diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 31e95519..7c9ad8b3 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -11,7 +11,7 @@

- Total obligated funds + {{ 'task_orders.form.step_4.obligated' | translate }} {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}

@@ -20,7 +20,7 @@

- Total Task Order value + {{ 'task_orders.form.step_4.total' | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}

@@ -29,7 +29,7 @@

- Total expended funds + {{ 'task_orders.form.step_4.expended' | translate }} {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}

@@ -39,7 +39,7 @@

-

Documents

+

{{ 'task_orders.form.step_4.documents' | translate }}

{% if builder_mode %} {{ Icon('ok', classes="icon--green icon--medium") }} @@ -52,7 +52,7 @@
-

CLIN summary

+

{{ 'task_orders.form.step_4.clins' | translate }}

diff --git a/templates/task_orders/step_1.html b/templates/task_orders/step_1.html index 59c0df70..177a41a8 100644 --- a/templates/task_orders/step_1.html +++ b/templates/task_orders/step_1.html @@ -16,8 +16,8 @@ {% block to_builder_form_field %} {{ TOFormStepHeader( - title='task_orders.form.supporting_docs_header' | translate, - description='task_orders.form.supporting_docs_text' | translate, + title='task_orders.form.step_1.title' | translate, + description='task_orders.form.step_1.description' | translate, ) }} {{ UploadInput(form.pdf, portfolio.id) }} {% endblock %} diff --git a/templates/task_orders/step_5.html b/templates/task_orders/step_5.html index ac40993a..a091ab32 100644 --- a/templates/task_orders/step_5.html +++ b/templates/task_orders/step_5.html @@ -8,7 +8,7 @@ {% set next_button_text = 'task_orders.form.step_5.next_button' | translate %} {% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %} {% set step = "5" %} -{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %} +{% set sticky_cta_text = 'task_orders.form.step_5.cta_text' | translate %} {% block to_builder_form_field %} {{ TOFormStepHeader( diff --git a/translations.yaml b/translations.yaml index 7153c77a..a553c622 100644 --- a/translations.yaml +++ b/translations.yaml @@ -495,7 +495,7 @@ task_orders: total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. expended_funds: All funds spend from the Task Order so far. form: - add_clin: Add another CLIN + add_clin: Add Another CLIN add_to_header: Enter the Task Order number add_to_description: Please input your 13-digit Task Order number. This number may be listed under "Order Number" if your Contracting Officer used form 1149, or "Delivery Order/Call No." if form 1155 was used. Moving forward, this portion of funding will be referenced by the recorded Task Order number. clin_title: Enter Contract Line Items @@ -511,19 +511,28 @@ task_orders: draft_alert_message: You can return to the Task Order Builder to enter missing information. Once you are finished, you’ll be ready to submit this request. total_funds_label: Total CLIN Value obligated_funds_label: Obligated Funds - pop: Period of Performance + pop: Period of Performance (PoP) pop_end: End Date pop_end_alert: "A CLIN's period of performance must end before {end_date}." pop_example: "For example: 07 04 1776" pop_start: Start Date - supporting_docs_header: Upload your supporting documentation supporting_docs_size_limit: Your file may not exceed 64MB - supporting_docs_text: Upload a single PDF containing all relevant information. + step_1: + title: Upload your approved Task Order (TO) + description: Upload your approved Task Order here. You are required to confirm you have the appropriate signature. You will have the ability to add additional approved Task Orders with more funding to this Portfolio in the future. step_3: next_button: 'Next: Review Task Order' + percent_obligated: '% of Funds Obligated' + step_4: + obligated: Total Obligated + total: Total Value + expended: Total Expended + documents: Documents + clins: CLIN Summary step_5: + cta_text: Verify Your Information description: Prior to submitting the Task Order, you must acknowledge, by marking the appropriate box below, that the uploaded Task Order is signed by an appropriate, duly warranted Contracting Officer who has the authority to execute the uploaded Task Order on your Agency’s behalf and has authorized you to upload the Task Order in accordance with Agency policy and procedures. You must further acknowledge, by marking the appropriate box below, that all information entered herein matches that of the submitted Task Order. - next_button: 'Confirm & Submit' + next_button: 'Submit Task Order' sticky_header_text: 'Add a Task Order' sticky_header_review_text: Review Changes sticky_header_context: 'Step {step} of 5'