diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index dc6907c9..bd2a8f77 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -35,13 +35,13 @@ class CLINForm(FlaskForm): ) start_date = DateField( translate("task_orders.form.pop_start"), - description="For example: 07 04 1776", + description=translate("task_orders.form.pop_example"), format="%m/%d/%Y", validators=[Optional()], ) end_date = DateField( translate("task_orders.form.pop_end"), - description="For example: 07 04 1776", + description=translate("task_orders.form.pop_example"), format="%m/%d/%Y", validators=[Optional()], ) diff --git a/templates/components/date_picker.html b/templates/components/date_picker.html index 9da411f0..0222c33e 100644 --- a/templates/components/date_picker.html +++ b/templates/components/date_picker.html @@ -9,7 +9,7 @@ maxdate=None, watch=False, optional=True, - date_alert=False) -%} + pop_end_alert=False) -%} - {% if date_alert %} - {{ Alert(message="A CLIN's period of performance must end before September 14, 2022.") }} + {% if pop_end_alert %} + {{ Alert(message="task_orders.form.pop_end_alert" | translate) }} {% endif %} {% if description %} diff --git a/templates/task_orders/step_3.html b/templates/task_orders/step_3.html index 8d958b3c..cd41eb1e 100644 --- a/templates/task_orders/step_3.html +++ b/templates/task_orders/step_3.html @@ -8,7 +8,7 @@ {% from 'task_orders/form_header.html' import TOFormStepHeader %} {% set action = url_for("task_orders.submit_form_step_three_add_clins", task_order_id=task_order_id) %} -{% set next_button_text = "Next: Review Funding" %} +{% set next_button_text = "task_orders.form.step_3.next_button" | translate %} {% set previous_button_link = url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id) %} {% set step = "3" %} @@ -31,7 +31,7 @@
- CLIN Details + {{ 'task_orders.form.clin_details' | translate }}
@@ -103,7 +103,7 @@
- CLIN Funding + {{ 'task_orders.form.clin_funding' | translate }}
{% if fields %} @@ -159,7 +159,7 @@
- Period of Performance + {{ 'task_orders.form.pop' | translate }}
{% if fields %} @@ -170,7 +170,7 @@
- {{ DatePicker(fields.end_date, watch=True, optional=False, date_alert=True) }} + {{ DatePicker(fields.end_date, watch=True, optional=False, pop_end_alert=True) }}
{% else %} @@ -183,7 +183,7 @@ {{ 'task_orders.form.pop_start' | translate }}

- For example: 07 04 1776 + {{ 'task_orders.form.pop_example' | translate }}

@@ -249,7 +249,7 @@ {{ Alert(message="A CLIN's period of performance must end before September 14, 2022.") }}

- For example: 07 04 1776 + {{ 'task_orders.form.pop_example' | translate }}

diff --git a/translations.yaml b/translations.yaml index 31f2478e..2c86575e 100644 --- a/translations.yaml +++ b/translations.yaml @@ -363,9 +363,11 @@ task_orders: add_clin: Add another CLIN add_to_header: Add your task order add_to_description: Now, refer to your document to find the 13-digit task order number. It should be located at lorem ipsum dolar. From now on we'll refer to this portion of funding by the recorded task order number. + base_clin_title: CLIN clin_title: Enter Contract Line Items clin_description: "Refer to your task order to locate your Contract Line Item Numbers (CLINs)." - base_clin_title: CLIN + clin_details: CLIN Details + clin_funding: CLIN Funding clin_number_label: CLIN Number clin_type_label: Corresponding IDIQ CLIN cloud_funding_header: Add the summary of cloud funding @@ -373,12 +375,17 @@ task_orders: draft_alert_title: Your information has been saved 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. obligated_funds_label: Obligated Funds + pop: Period of Performance pop_end: End Date + pop_end_alert: "A CLIN's period of performance must end before September 14, 2022." + pop_example: "For example: 07 04 1776" pop_start: Start Date review_button: Review task order 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_3: + next_button: 'Next: Review Task Order' step_5: title: Confirm Signature description: Finally, plase confirm that your uploaded document representing the information you've entered contains the required signature from your Contracting Officer. You will be informed as soon as CCPO completes their review.