From d0522303d5cc42fb18694c1ad3c75fea58f1c6a5 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Mar 2019 10:08:30 -0400 Subject: [PATCH 1/3] Update invite flash copy --- atst/utils/flash.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index b47dc1d2..296522e1 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -3,8 +3,8 @@ from atst.utils.localization import translate MESSAGES = { "invitation_resent": { - "title_template": "The {{ officer_type }} invite has been resent", - "message_template": "Invitation has been resent", + "title_template": "The {{ officer_type }} has been resent instructions to join this portfolio.", + "message_template": "Invitation resent", "category": "success", }, "task_order_draft": { From d16d2331457245517327ece720044687ca671d10 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Mar 2019 11:13:28 -0400 Subject: [PATCH 2/3] Update text on confirmation button --- templates/portfolios/task_orders/invitations.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index 1f112b12..19949d43 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -102,6 +102,8 @@ {{ ConfirmationButton( btn_text="Resend Invitation", + confirm_btn="Resend", + confirm_msg="Are you sure you'd like to resend this invitation?", action=url_for( "portfolios.resend_invite", portfolio_id=portfolio.id, From 2cce348411fc3f855f024fa76604bcf8197e0b92 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Mar 2019 11:17:42 -0400 Subject: [PATCH 3/3] Add in translations --- atst/utils/flash.py | 4 ++-- templates/portfolios/task_orders/invitations.html | 4 ++-- translations.yaml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 296522e1..7b1db8c2 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -3,8 +3,8 @@ from atst.utils.localization import translate MESSAGES = { "invitation_resent": { - "title_template": "The {{ officer_type }} has been resent instructions to join this portfolio.", - "message_template": "Invitation resent", + "title_template": "Invitation resent", + "message_template": "The {{ officer_type }} has been resent instructions to join this portfolio.", "category": "success", }, "task_order_draft": { diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index 19949d43..b5d46386 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -102,8 +102,8 @@ {{ ConfirmationButton( btn_text="Resend Invitation", - confirm_btn="Resend", - confirm_msg="Are you sure you'd like to resend this invitation?", + confirm_btn=('task_orders.invitations.resend_btn' | translate), + confirm_msg=('task_orders.invitations.resend_confirmation_message' | translate), action=url_for( "portfolios.resend_invite", portfolio_id=portfolio.id, diff --git a/translations.yaml b/translations.yaml index 28c6c951..3fc9a1e7 100644 --- a/translations.yaml +++ b/translations.yaml @@ -508,6 +508,8 @@ task_orders: invitations: dod_id_label: DoD ID edit_text: A new invitation e-mail will be sent when new information is saved. + resend_btn: Resend + resend_confirmation_message: Are you sure you'd like to resend this invitation? contracting_officer: title: Contracting Officer (KO) Information description: You'll need a signature from your KO. You might want to work with your program Financial Manager to get your TO documents moving in the right direction.