From 24be9a6a61bc4c46c24c0eba40eef7a61a8f9012 Mon Sep 17 00:00:00 2001 From: graham-dds Date: Wed, 9 Oct 2019 09:42:47 -0400 Subject: [PATCH] Update copy for new app provisioning - change flashed message for adding members - use the correct helper text for the app name input - a few other updates to text in translations --- atst/routes/applications/settings.py | 6 +----- atst/utils/flash.py | 4 ++-- templates/applications/new/step_1.html | 2 +- translations.yaml | 16 +++++++++------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 18b92603..8b92ca0f 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -183,11 +183,7 @@ def handle_create_member(application_id, form_data): token=invite.token, ) - flash( - "new_application_member", - user_name=invite.user_name, - application_name=application.name, - ) + flash("new_application_member", user_name=invite.first_name) except AlreadyExistsError: return render_template( diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 623306d5..1e6b1bce 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -104,9 +104,9 @@ MESSAGES = { "category": "warning", }, "new_application_member": { - "title_template": translate("flash.success"), + "title_template": """{{ "flash.new_application_member.title" | translate({ "user_name": user_name }) }}""", "message_template": """ -

{{ "flash.new_application_member" | translate({ "user_name": user_name, "application_name": application_name }) }}

+

{{ "flash.new_application_member.message" | translate({ "user_name": user_name }) }}

""", "category": "success", }, diff --git a/templates/applications/new/step_1.html b/templates/applications/new/step_1.html index 9ae0ba36..dcf30dac 100644 --- a/templates/applications/new/step_1.html +++ b/templates/applications/new/step_1.html @@ -28,7 +28,7 @@
{{ TextInput(form.name, optional=False) }} - {{ ('portfolios.applications.new.step_1_form_help_text.description' | translate | safe) }} + {{ ('portfolios.applications.new.step_1_form_help_text.name' | translate | safe) }}
diff --git a/translations.yaml b/translations.yaml index a77da2eb..a7b60162 100644 --- a/translations.yaml +++ b/translations.yaml @@ -106,7 +106,7 @@ email: portfolio_invite: "{inviter_name} has invited you to a JEDI cloud portfolio" flash: application: - created: 'You have successfully created the {application_name} application.' + created: '{application_name} has been successfully created. You may continue on to provision environments and assign team members now, or come back and complete these tasks at a later time.' updated: 'You have successfully updated the {application_name} application.' deleted: 'You have successfully deleted the {application_name} application. To view the retained activity log, visit the portfolio administration page.' delete_member_success: 'You have successfully deleted {member_name} from the portfolio.' @@ -118,7 +118,9 @@ flash: new_ppoc_message: 'You have successfully added {ppoc_name} as the primary point of contact. You are no longer the PPoC.' new_ppoc_title: Primary point of contact updated success: Success! - new_application_member: '{user_name} has been added to {application_name}. They will not have access until they accept the invitation e-mailed to them and CSP processing is complete.' + new_application_member: + title: "{user_name}'s invitation has been sent" + message: "{user_name}'s access to this Application is pending until they sign in for the first time." updated_application_team_settings: 'You have updated the {application_name} team settings.' logged_out: Logged out footer: @@ -310,12 +312,12 @@ portfolios: app_settings_text: App settings new: step_1_header: Name and Describe New Application - step_1_button_text: "Save and Add Environments" + step_1_button_text: "Next: Add Environments" step_1_form_help_text: name: |

- The name of your application should be intuitive and easily recognizable for all of your team members. + The name of your Application should be intuitive and easily recognizable for all of your team members.

Writer's Block? A naming example includes: @@ -330,7 +332,7 @@ portfolios: Add a brief one to two sentence description of your application. You should be able to reference your TO Description of Work.

- Writer's Block? A naming example includes: + Writer's Block? A description example includes:

@@ -338,9 +340,9 @@ portfolios:
step_2_header: Add Environments to {application_name} step_2_description: "Production, Staging, Testing, and Development environments are included by default. However, you can add, edit, and delete environments based on the needs of your Application." - step_2_button_text: "Save and Add Members" + step_2_button_text: "Next: Add Members" step_3_header: Invite Members to {application_name} - step_3_description: "To proceed, you will need each member's email address and DOD ID. Within this section, you will also assign application-level permissions and environment-level roles for each member." + step_3_description: "To proceed, you will need each member's email address and DOD ID. Within this section, you will also assign Application-level permissions and environment-level roles for each member." step_3_button_text: Save Application 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.