diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 1fc6a740..5cf44edd 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -29,9 +29,9 @@ MESSAGES = { "category": "success", }, "new_portfolio_member": { - "title_template": "Success!", + "title_template": translate("flash.success"), "message_template": """ -

You have successfully invited {{ new_member.user_name }} to the portfolio admin.

+

{{ "flash.new_portfolio_member" | translate({ "user_name": new_member.user_name }) }}

""", "category": "success", }, @@ -112,20 +112,18 @@ MESSAGES = { "category": "success", }, "task_order_congrats": { - "title_template": "Congrats!", - "message_template": """ - You've created a new JEDI portfolio and jump started your first task order! - """, + "title_template": translate("flash.congrats"), + "message_template": translate("flash.new_portfolio"), "actions": """ {% from "components/icon.html" import Icon %}
{{ Icon('shield') }} - Go to my Portfolio Home Page + {{ "flash.portfolio_home" | translate }} {{ Icon('arrow-down') }} - Review Next Steps Below + {{ "flash.next_steps" | translate }}
""", @@ -139,8 +137,10 @@ MESSAGES = { "category": "error", }, "portfolio_member_removed": { - "title_template": "Portfolio Member Removed", - "message_template": "You have successfully removed {{ member_name }} from the portfolio.", + "title_template": translate("flash.deleted_member"), + "message_template": """ + {{ "flash.delete_member_success" | translate({ "member_name": member_name }) }} + """, "category": "success", }, } diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html index 0763aad0..f548f857 100644 --- a/templates/fragments/admin/portfolio_members.html +++ b/templates/fragments/admin/portfolio_members.html @@ -26,7 +26,7 @@ {% if not portfolio.members %} -

There are currently no members in this Portfolio.

+

{{ "portfolios.admin.no_members" | translate }}

{% else %} @@ -59,12 +59,12 @@ {% for member in portfolio.members %} {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %} {% call Modal(name=modal_id, dismissable=False) %} -

Are you sure you want to archive this user?

+

{{ "portfolios.admin.alert_header" | translate }}

{{ Alert( - title="Warning! You are about to archive a user from the portfolio admin.", - message="User will be removed from the portfolio, but their log history will be retained.", + title="portfolios.admin.alert_title" | translate, + message="portfolios.admin.alert_message" | translate, level="warning" ) }} @@ -76,7 +76,7 @@ {{ "portfolios.members.archive_button" | translate }} - Cancel + {{ "common.cancel" | translate }} {% endcall %} {% endfor %} @@ -89,7 +89,7 @@ type='submit' form="member-perms" class='usa-button usa-button-primary' - value='Save' /> + value={{ "common.save" | translate }} /> {% endif %} {% if user_can(permissions.CREATE_PORTFOLIO_USERS) %} {% include "fragments/admin/add_new_portfolio_member.html" %} diff --git a/translations.yaml b/translations.yaml index e8fc0559..fdfcc5b5 100644 --- a/translations.yaml +++ b/translations.yaml @@ -17,10 +17,21 @@ base_public: header_title: JEDI Cloud login: Log in title_tag: JEDI Cloud +flash: + new_portfolio_member: You have successfully invited {user_name} to the portfolio. + success: Success! + congrats: Congrats! + new_portfolio: You've created a new JEDI portfolio and jump-started your first task order! + portfolio_home: Go to my portfolio home page + next_steps: Review next steps below + deleted_member: Portfolio member deleted + delete_member_success: You have successfully deleted {member_name} from the portfolio. common: back: Back edit: Edit manage: manage + cancel: Cancel + save: Save save_and_continue: Save & Continue sign: Sign officer_helpers: @@ -305,9 +316,9 @@ fragments: portfolio_admin: none: Not Selected ppoc: - title: Primary Point of Contact - subtitle: The PoC has the ability to edit all aspects of a portfolio. - update_btn: Update Primary PoC + title: Primary point of contact (PPoC) + subtitle: The PPoC has the ability to edit all aspects of a portfolio and is the only one who can manage the PPoC role. + update_btn: Update login: ccpo_logo_alt_text: Cloud Computing Program Office Logo certificate_selection: @@ -563,15 +574,19 @@ portfolios: title: '{application_name} Team Management' subheading: Team Management admin: - portfolio_members_title: Portfolio Members + portfolio_members_title: Portfolio members portfolio_members_subheading: These members have different levels of access to the portfolio. settings_info: Learn more about these settings add_member: Add a new member permissions_info: Learn more about these permissions activity_log_title: Activity log add_new_member: Add a new member + alert_header: Are you sure you want to delete this member? + alert_title: Warning! You are about to delete a member from the portfolio. + alert_message: The member will be removed from the portfolio, but their log history will be retained. + no_members: There are currently no members in this portfolio. members: - archive_button: Archive user + archive_button: Delete member permissions: name: Name app_mgmt: App management