diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index fb902524..b1cccfaa 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -27,10 +27,14 @@ def coerce_enum(enum_inst): class CLINForm(FlaskForm): jedi_clin_type = SelectField( - "CLIN type", choices=JEDI_CLIN_TYPES, coerce=coerce_enum + translate("task_orders.form.clin_type_label"), + choices=JEDI_CLIN_TYPES, + coerce=coerce_enum, ) - number = StringField(label="CLIN", validators=[Optional()]) + number = StringField( + label=translate("task_orders.form.clin_number_label"), validators=[Optional()] + ) start_date = DateField( translate("forms.task_order.start_date_label"), format="%m/%d/%Y", @@ -42,7 +46,8 @@ class CLINForm(FlaskForm): validators=[Optional()], ) obligated_amount = DecimalField( - label="Funds obligated for cloud", validators=[Optional()] + label=translate("task_orders.form.obligated_funds_label"), + validators=[Optional()], ) loas = FieldList(StringField()) @@ -53,7 +58,7 @@ class TaskOrderForm(BaseForm): ) pdf = FileField( None, - description="Your file may not exceed 50MB", + description=translate("task_orders.form.supporting_docs_size_limit"), validators=[ FileAllowed(["pdf"], translate("forms.task_order.file_format_not_allowed")), FileLength(message=translate("forms.validators.file_length")), diff --git a/templates/components/date_picker.html b/templates/components/date_picker.html index d6230859..6924eddc 100644 --- a/templates/components/date_picker.html +++ b/templates/components/date_picker.html @@ -35,7 +35,7 @@
- +
- +
- +
- {% endmacro %} @@ -76,7 +75,7 @@
- Line of accounting (43 characters) + {{ 'task_orders.form.loa_label' | translate }}
{% for loa in fields.loas %} @@ -114,7 +113,7 @@ v-bind:initial-total='{{ total }}' v-bind:initial-clin-count="{{ form.clins.data | length }}">
- {% call StickyCTA(text="Add Funding") %} + {% call StickyCTA(text=('task_orders.form.sticky_header_text' | translate )) %}
-
Add your task order
+
{{ 'task_orders.form.add_to_header' | translate }}
{{ TextInput(form.number, validation='taskOrderNumber', optional=False) }}
-
Add the summary of cloud funding
+
{{ 'task_orders.form.cloud_funding_header' | translate }}
- Data must match with what is in your uploaded document. + {{ 'task_orders.form.cloud_funding_text' | translate }}
{% for clin in form.clins %} @@ -182,7 +181,7 @@
- CLIN type + {{ 'task_orders.form.clin_type_label' | translate }}
- +
- +
- +
- End of period of performance (PoP) + {{ 'task_orders.form.pop_end' | translate }}
@@ -313,7 +312,7 @@
- +
- +
- +
@@ -401,19 +400,18 @@
-
-
Upload your supporting documentation
+
{{ 'task_orders.form.supporting_docs_header' | translate }}
- Upload a single PDF containing all relevant information. {{ Icon('question')}} + {{ 'task_orders.form.supporting_docs_text' | translate }} {{ Icon('question')}}
{{ UploadInput(form.pdf, watch=True) }}
diff --git a/translations.yaml b/translations.yaml index 2044a381..917142f0 100644 --- a/translations.yaml +++ b/translations.yaml @@ -47,6 +47,10 @@ common: choose_role: Choose a role name: Name components: + date_selector: + day: Day + month: Month + year: Year modal: destructive_message: You will no longer be able to access this {resource} destructive_title: Warning! This action is permanent @@ -332,8 +336,24 @@ task_orders: pop_end: PoP End loa: LOA form: + add_clin: Add another CLIN or Sub-CLIN + add_loa: Add another line of accounting + add_to_header: Add your task order + clin_number_label: CLIN + clin_type_label: CLIN type + cloud_funding_header: Add the summary of cloud funding + cloud_funding_text: Data must match with what is in your uploaded document. 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. + loa_label: 'Line of accounting (43 characters)' + obligated_funds_label: Funds obligated for cloud + pop_end: 'End of period of performance (PoP)' + pop_start: 'Start of period of performance (PoP)' + review_button: Review task order + supporting_docs_header: Upload your supporting documentation + supporting_docs_size_limit: Your file may not exceed 1MB + supporting_docs_text: Upload a single PDF containing all relevant information. + sticky_header_text: Add Funding new: form_help_text: Before you can begin work in the cloud, you'll need to complete the information below and upload your approved task order for reference by the CCPO. app_info: