diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 6ff8a496..0f8229e1 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -104,8 +104,8 @@ {% set new_member_modal_name = "add-app-mem" %} {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %} - {{ "portfolios.admin.add_new_member" | translate }} {{ Icon("plus") }} + {{ "portfolios.applications.add_member" | translate }} {% endif %} @@ -158,21 +158,18 @@ {% endif %} -
- Environments + {{ 'common.resource_names.environments' | translate }} {% if user_can(permissions.CREATE_ENVIRONMENT) %} {% include "fragments/applications/add_new_environment.html" %} {% endif %}
- - {% if g.matchesPath("application-environments") %} - {% include "fragments/flash.html" %} - {% endif %} -
+ {% if g.matchesPath("application-environments") %} + {% include "fragments/flash.html" %} + {% endif %}
    @@ -200,28 +197,20 @@ }} - {% set open_members_button %} - {{ env['member_count'] }} members - {% endset %} - - {% set close_members_button %} - {{ env['member_count'] }} members - {% endset %} - + {% set members_button = "portfolios.applications.member_count" | translate({'count': env['member_count']}) %} {{ ToggleButton( - open_html=open_members_button, - close_html=close_members_button, + open_html=members_button, + close_html=members_button, section_name="members" ) }}
-
- Cloud Service Provider Link {{ Icon('link', classes="icon--tiny") }} + {{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }}
diff --git a/translations.yaml b/translations.yaml index faa4ad0e..11ed462d 100644 --- a/translations.yaml +++ b/translations.yaml @@ -281,13 +281,15 @@ portfolios: portfolio_name: Portfolio name applications: add_application_text: Add a new application - add_environment: Add new environment + add_environment: Create an Environment + add_member: Add a New Team Member add_another_environment: Add another environment app_settings_text: App settings create_button_text: Create create_new_env: Create a new environment. create_new_env_info: Creating an environment gives you access to the Cloud Service Provider. This environment will function within the constraints of the task order, and any costs will be billed against the portfolio. csp_console_text: CSP console + csp_link: Cloud Service Provider Link remove_member: alert: message: '{user_name} will no longer be able to access this application or any of its environments' @@ -298,7 +300,7 @@ portfolios: message: You will lose access to this application and all environments will be removed from the CSP. Your reporting and activity will still be accessible. button: Delete application header: Are you sure you want to delete this application? - panel_text: 'Deleting {name} will delete this applicaiton along with all {env_count} {pluralized_env}. This cannot be undone.' + panel_text: 'Deleting {name} will delete this application along with all {env_count} {pluralized_env}. This cannot be undone.' subheading: Delete Application enter_env_name: "Enter environment name:" environments: @@ -309,6 +311,7 @@ portfolios: environments_description: Each environment created within an application is logically separated from one another for easier management and security. environments_heading: Application environments existing_application_title: '{application_name} Application Settings' + member_count: '{count} members' new_application_title: New Application settings_heading: Application Settings settings: