diff --git a/atst/forms/portfolio.py b/atst/forms/portfolio.py index 069659bb..591cc080 100644 --- a/atst/forms/portfolio.py +++ b/atst/forms/portfolio.py @@ -28,6 +28,7 @@ class PortfolioForm(BaseForm): class PortfolioCreationForm(PortfolioForm): defense_component = SelectMultipleField( + translate("forms.portfolio.defense_component.title"), choices=SERVICE_BRANCHES, widget=ListWidget(prefix_label=False), option_widget=CheckboxInput(), diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 91676cfb..ed45fe2e 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -509,11 +509,7 @@ def resend_invite(application_id, application_role_id): token=new_invite.token, ) - flash( - "application_invite_resent", - user_name=new_invite.user_name, - application_name=app_role.application.name, - ) + flash("application_invite_resent", email=new_invite.email) else: flash( "application_invite_error", diff --git a/atst/routes/portfolios/invitations.py b/atst/routes/portfolios/invitations.py index 7c48593f..9ec56aa3 100644 --- a/atst/routes/portfolios/invitations.py +++ b/atst/routes/portfolios/invitations.py @@ -65,7 +65,7 @@ def resend_invitation(portfolio_id, portfolio_token): inviter_name=g.current_user.full_name, token=invite.token, ) - flash("resend_portfolio_invitation", user_name=invite.user_name) + flash("resend_portfolio_invitation", email=invite.email) else: user_name = f"{form['user_data']['first_name'].data} {form['user_data']['last_name'].data}" flash("resend_portfolio_invitation_error", user_name=user_name) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 7a1cf4ce..02a74cb2 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -29,7 +29,7 @@ MESSAGES = { "category": "error", }, "application_invite_resent": { - "title": "flash.application_invite.resent.title", + "title": None, "message": "flash.application_invite.resent.message", "category": "success", }, @@ -90,7 +90,7 @@ MESSAGES = { }, "insufficient_funds": { "title": "flash.task_order.insufficient_funds.title", - "message": "", + "message": None, "category": "warning", }, "logged_out": { @@ -109,8 +109,8 @@ MESSAGES = { "category": "success", }, "new_portfolio_member": { - "title": "flash.success", - "message": "flash.new_portfolio_member", + "title": "flash.new_portfolio_member.title", + "message": "flash.new_portfolio_member.message", "category": "success", }, "portfolio_member_removed": { @@ -124,7 +124,7 @@ MESSAGES = { "category": "success", }, "resend_portfolio_invitation": { - "title": "flash.portfolio_invite.resent.title", + "title": None, "message": "flash.portfolio_invite.resent.message", "category": "success", }, 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/applications/fragments/environments.html b/templates/applications/fragments/environments.html index 9e9a3ef8..09da6e53 100644 --- a/templates/applications/fragments/environments.html +++ b/templates/applications/fragments/environments.html @@ -84,7 +84,7 @@ {{ TextInput(edit_form.name, validation='requiredField', optional=False) }} {{ SaveButton( - text=("common.save" | translate) + text=("common.save_changes" | translate) ) }} diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html index 707653fa..03efa474 100644 --- a/templates/applications/fragments/member_form_fields.html +++ b/templates/applications/fragments/member_form_fields.html @@ -21,7 +21,7 @@ {{ sub_form.environment_name.data }}
- {{ role }} + {{ "portfolios.applications.members.roles.{}".format(role) | translate }}
@@ -124,6 +124,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - How do I find the DoD ID? + {{ "forms.new_member.dod_help" | translate }}
{% endmacro %} diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html index 9bd80dd0..5cae077f 100644 --- a/templates/applications/fragments/members.html +++ b/templates/applications/fragments/members.html @@ -46,7 +46,7 @@ {{ member_form.SubmitStep( name=modal_name, form=member_fields.PermsFields(form=member.form, member_role_id=member.role_id), - submit_text="Update", + submit_text="common.save_changes"|translate, previous=False, modal=modal_name, ) }} @@ -179,7 +179,7 @@ member_form.SubmitStep( name=new_member_modal_name, form=member_fields.PermsFields(form=new_member_form, new=True), - submit_text="portfolios.applications.members.form.add_member"|translate, + submit_text="common.save_changes"|translate, modal=new_member_modal_name, ) ], diff --git a/templates/applications/new/step_3.html b/templates/applications/new/step_3.html index a4e1aa53..d88a704c 100644 --- a/templates/applications/new/step_3.html +++ b/templates/applications/new/step_3.html @@ -27,13 +27,13 @@ - Return to Application Settings + {{ "portfolios.applications.new.step_3_button_text" | translate }} - Previous + {{ "common.previous" | translate }} - Cancel + {{ "common.cancel" | translate }} 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/error.html b/templates/error.html index ca5e19d8..449c9a88 100644 --- a/templates/error.html +++ b/templates/error.html @@ -17,15 +17,6 @@ {%- endif %}

-
-
-

- {{ "common.lorem" | translate }} -

-

- More lorem -

-
{% endblock %} diff --git a/templates/portfolios/fragments/member_form_fields.html b/templates/portfolios/fragments/member_form_fields.html index 7bfccc37..3d7b1eb5 100644 --- a/templates/portfolios/fragments/member_form_fields.html +++ b/templates/portfolios/fragments/member_form_fields.html @@ -32,6 +32,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - How do I find the DoD ID? + {{ "forms.new_member.dod_help" | translate }} {% endmacro %} diff --git a/templates/portfolios/new/step_1.html b/templates/portfolios/new/step_1.html index abc6d25e..4d48e969 100644 --- a/templates/portfolios/new/step_1.html +++ b/templates/portfolios/new/step_1.html @@ -15,8 +15,7 @@

{{ "portfolios.header" | translate }}

{{ "New Portfolio" }}

- - {{ StickyCTA(text="Create New Portfolio") }} + {{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
@@ -41,9 +40,9 @@