diff --git a/atst/forms/portfolio_member.py b/atst/forms/portfolio_member.py index 6ee3f3b5..4c39ad1e 100644 --- a/atst/forms/portfolio_member.py +++ b/atst/forms/portfolio_member.py @@ -14,29 +14,35 @@ class PermissionsForm(BaseForm): perms_app_mgmt = SelectField( translate("forms.new_member.app_mgmt"), choices=[ - (PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT, "View"), - (PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT, "Edit"), + ( + PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT, + translate("common.view"), + ), + ( + PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT, + translate("common.edit"), + ), ], ) perms_funding = SelectField( translate("forms.new_member.funding"), choices=[ - (PermissionSets.VIEW_PORTFOLIO_FUNDING, "View"), - (PermissionSets.EDIT_PORTFOLIO_FUNDING, "Edit"), + (PermissionSets.VIEW_PORTFOLIO_FUNDING, translate("common.view")), + (PermissionSets.EDIT_PORTFOLIO_FUNDING, translate("common.edit")), ], ) perms_reporting = SelectField( translate("forms.new_member.reporting"), choices=[ - (PermissionSets.VIEW_PORTFOLIO_REPORTS, "View"), - (PermissionSets.EDIT_PORTFOLIO_REPORTS, "Edit"), + (PermissionSets.VIEW_PORTFOLIO_REPORTS, translate("common.view")), + (PermissionSets.EDIT_PORTFOLIO_REPORTS, translate("common.edit")), ], ) perms_portfolio_mgmt = SelectField( translate("forms.new_member.portfolio_mgmt"), choices=[ - (PermissionSets.VIEW_PORTFOLIO_ADMIN, "View"), - (PermissionSets.EDIT_PORTFOLIO_ADMIN, "Edit"), + (PermissionSets.VIEW_PORTFOLIO_ADMIN, translate("common.view")), + (PermissionSets.EDIT_PORTFOLIO_ADMIN, translate("common.edit")), ], ) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 12b43b2d..f2b07ed6 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -160,7 +160,7 @@ MESSAGES = { "title_template": translate("flash.success"), "message_template": """ {{ "flash.application.deleted" | translate({"application_name": application_name}) }} - translate("common.undo") + {{ "common.undo" | translate }} """, "category": "success", }, diff --git a/templates/fragments/admin/members_view.html b/templates/fragments/admin/members_view.html index b79979b4..9e3a3368 100644 --- a/templates/fragments/admin/members_view.html +++ b/templates/fragments/admin/members_view.html @@ -18,7 +18,7 @@ {% if dict(access.choices).get(access.data) == ('portfolios.members.permissions.edit_access' | translate) %}