From 5b77d6c0d03300cc1ce0b9543f65451a62cfa811 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Thu, 4 Apr 2019 13:26:40 -0400 Subject: [PATCH 1/6] Updating some more capitalization --- atst/utils/flash.py | 12 ++++++------ translations.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 69239977..d73a92d1 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -10,7 +10,7 @@ MESSAGES = { "task_order_draft": { "title_template": translate("task_orders.form.draft_alert_title"), "message_template": """ -

Please complete your Task Order before submitting it for approval.

+

Please complete your task order before submitting it for approval.

""", "category": "warning", }, @@ -24,7 +24,7 @@ MESSAGES = { "new_portfolio_member": { "title_template": "Success!", "message_template": """ -

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

+

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

""", "category": "success", }, @@ -73,7 +73,7 @@ MESSAGES = { "portfolio_member_dod_id_error": { "title_template": "CAC ID Error", "message_template": """ - The member attempted to accept this invite, but their CAC ID did not match the CAC ID you specified on the invite. Please confirm that the DOD ID is accurate. + The member attempted to accept this invite, but their CAC ID did not match the CAC ID you specified on the invite. Please confirm that the DoD ID is accurate. """, "category": "error", }, @@ -114,11 +114,11 @@ MESSAGES = {
{{ Icon('shield') }} - Go to my Portfolio Home Page + Go to my portfolio home page {{ Icon('arrow-down') }} - Review Next Steps Below + Review next steps below
""", @@ -127,7 +127,7 @@ MESSAGES = { "task_order_incomplete": { "title_template": "Task Order Incomplete", "message_template": """ - You must complete your Task Order form before submitting. + You must complete your task order form before submitting. """, "category": "error", }, diff --git a/translations.yaml b/translations.yaml index c4ab5a67..40d0701e 100644 --- a/translations.yaml +++ b/translations.yaml @@ -571,7 +571,7 @@ portfolios: activity_log_title: Activity Log add_new_member: Add a new member members: - archive_button: Archive User + archive_button: Delete member permissions: name: Name app_mgmt: App Mgmt From 265612c339fc16b0508a6e6be271dc1ec37e90a5 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Thu, 4 Apr 2019 13:56:41 -0400 Subject: [PATCH 2/6] Updating some more capitalization and word choice --- atst/utils/flash.py | 2 +- .../fragments/admin/add_new_portfolio_member.html | 8 ++++---- translations.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index d73a92d1..1159e4c8 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -107,7 +107,7 @@ MESSAGES = { "task_order_congrats": { "title_template": "Congrats!", "message_template": """ - You've created a new JEDI portfolio and jump started your first task order! + You've created a new JEDI portfolio and jump-started your first task order! """, "actions": """ {% from "components/icon.html" import Icon %} diff --git a/templates/fragments/admin/add_new_portfolio_member.html b/templates/fragments/admin/add_new_portfolio_member.html index 1e09dce6..fdbf7b2c 100644 --- a/templates/fragments/admin/add_new_portfolio_member.html +++ b/templates/fragments/admin/add_new_portfolio_member.html @@ -17,7 +17,7 @@ {% set step_one %}
-

Invite New Portfolio Member

+

Invite new portfolio member

@@ -48,14 +48,14 @@ v-on:click="next()" v-bind:disabled="invalid" class='action-group__action usa-button' - value='Next Step'> + value='Next'> Cancel
{% endset %} {% set step_two %}
-

Assign Member Permissions

+

Assign member permissions

{{ Icon('info') }} {{ "portfolios.admin.permissions_info" | translate }} @@ -70,7 +70,7 @@ type="submit" class='action-group__action usa-button' form="add-port-mem" - value='Invite Member'> + value='Invite member'> Cancel
diff --git a/translations.yaml b/translations.yaml index 40d0701e..6cb36a17 100644 --- a/translations.yaml +++ b/translations.yaml @@ -305,9 +305,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. + update_btn: Update login: ccpo_logo_alt_text: Cloud Computing Program Office Logo certificate_selection: @@ -566,9 +566,9 @@ portfolios: 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 + add_member: Add a new member permissions_info: Learn more about these permissions - activity_log_title: Activity Log + activity_log_title: Activity log add_new_member: Add a new member members: archive_button: Delete member From d34e90a76cad8731c6c657376cb927f717d46b20 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Thu, 4 Apr 2019 14:32:51 -0400 Subject: [PATCH 3/6] Updating language for deleting portfolio members --- atst/utils/flash.py | 4 ++-- templates/fragments/admin/portfolio_members.html | 6 +++--- translations.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index bae2821a..465d1f9b 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -139,8 +139,8 @@ MESSAGES = { "category": "error", }, "portfolio_member_removed": { - "title_template": "Portfolio Member Removed", - "message_template": "You have successfully removed {{ member_name }} from the portfolio.", + "title_template": "Portfolio member deleted", + "message_template": "You have successfully deleted {{ member_name }} from the portfolio.", "category": "success", }, } diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html index 0763aad0..2cb8eacf 100644 --- a/templates/fragments/admin/portfolio_members.html +++ b/templates/fragments/admin/portfolio_members.html @@ -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?

+

Are you sure you want to delete this member?

{{ 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="Warning! You are about to delete a member from the portfolio.", + message="The member will be removed from the portfolio, but their log history will be retained.", level="warning" ) }} diff --git a/translations.yaml b/translations.yaml index 03894cae..244ea305 100644 --- a/translations.yaml +++ b/translations.yaml @@ -306,7 +306,7 @@ fragments: none: Not Selected ppoc: title: Primary point of contact (PPoC) - subtitle: The PPoC has the ability to edit all aspects of a portfolio. + 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 @@ -563,7 +563,7 @@ 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 From 53a66fdfab53495364c4a6335fa76890bfcfd1ad Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Fri, 5 Apr 2019 09:43:46 -0400 Subject: [PATCH 4/6] Adding language to translations file --- templates/fragments/admin/portfolio_members.html | 12 ++++++------ translations.yaml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html index 2cb8eacf..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 delete this member?

+

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

{{ Alert( - title="Warning! You are about to delete a member from the portfolio.", - message="The member 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 244ea305..3fab9755 100644 --- a/translations.yaml +++ b/translations.yaml @@ -21,6 +21,8 @@ common: back: Back edit: Edit manage: manage + cancel: Cancel + save: Save save_and_continue: Save & Continue sign: Sign officer_helpers: @@ -570,6 +572,10 @@ portfolios: 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: Delete member permissions: From 5401fd476964763f3d53c4867160260d0cc8ecf7 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Fri, 5 Apr 2019 11:22:06 -0400 Subject: [PATCH 5/6] Updating translation file --- atst/utils/flash.py | 18 ++++++++---------- translations.yaml | 9 +++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 465d1f9b..49197c6b 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": """{{ "flash.success" | translate }}""", "message_template": """ -

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

+

{{ "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": """{{ "flash.congrats" | translate }}""", + "message_template": """{{ "flash.new_portfolio" | translate }}""", "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,8 @@ MESSAGES = { "category": "error", }, "portfolio_member_removed": { - "title_template": "Portfolio member deleted", - "message_template": "You have successfully deleted {{ member_name }} from the portfolio.", + "title_template": """{{ "flash.deleted_member" | translate }}""", + "message_template": """{{ "flash.delete_member_success" | translate({ "member_name": member_name }) }}""", "category": "success", }, } diff --git a/translations.yaml b/translations.yaml index 3fab9755..fdfcc5b5 100644 --- a/translations.yaml +++ b/translations.yaml @@ -17,6 +17,15 @@ 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 From 48d7918b6661fbab4a4f4ea877e00fa6e8399b51 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 5 Apr 2019 11:47:58 -0400 Subject: [PATCH 6/6] Use translate function directly --- atst/utils/flash.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 49197c6b..5cf44edd 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -29,7 +29,7 @@ MESSAGES = { "category": "success", }, "new_portfolio_member": { - "title_template": """{{ "flash.success" | translate }}""", + "title_template": translate("flash.success"), "message_template": """

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

""", @@ -112,8 +112,8 @@ MESSAGES = { "category": "success", }, "task_order_congrats": { - "title_template": """{{ "flash.congrats" | translate }}""", - "message_template": """{{ "flash.new_portfolio" | translate }}""", + "title_template": translate("flash.congrats"), + "message_template": translate("flash.new_portfolio"), "actions": """ {% from "components/icon.html" import Icon %}
@@ -137,8 +137,10 @@ MESSAGES = { "category": "error", }, "portfolio_member_removed": { - "title_template": """{{ "flash.deleted_member" | translate }}""", - "message_template": """{{ "flash.delete_member_success" | translate({ "member_name": member_name }) }}""", + "title_template": translate("flash.deleted_member"), + "message_template": """ + {{ "flash.delete_member_success" | translate({ "member_name": member_name }) }} + """, "category": "success", }, }