pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update copy for invite alert messages, CLIN error message, and use translations in flash file

Browse Source
This commit is contained in:
leigh-mil 2020-01-20 15:45:59 -05:00
parent d0ae04193b
commit 6f85f6de97
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atst/routes/applications/settings.py
View File

@ -509,11 +509,7 @@ def resend_invite(application_id, application_role_id):
token=new_invite.token, token=new_invite.token,
) )
flash( flash("application_invite_resent", email=new_invite.email)
"application_invite_resent",
user_name=new_invite.user_name,
application_name=app_role.application.name,
)
else: else:
flash( flash(
"application_invite_error", "application_invite_error",

6
atst/utils/flash.py
View File

@ -29,7 +29,7 @@ MESSAGES = {
"category": "error", "category": "error",
}, },
"application_invite_resent": { "application_invite_resent": {
"title": "flash.application_invite.resent.title", "title": "",
"message": "flash.application_invite.resent.message", "message": "flash.application_invite.resent.message",
"category": "success", "category": "success",
}, },
@ -90,7 +90,7 @@ MESSAGES = {
}, },
"insufficient_funds": { "insufficient_funds": {
"title": "flash.task_order.insufficient_funds.title", "title": "flash.task_order.insufficient_funds.title",
"message": "", "message": "flash.task_order.insufficient_funds.message",
"category": "warning", "category": "warning",
}, },
"logged_out": { "logged_out": {
@ -104,7 +104,7 @@ MESSAGES = {
"category": "warning", "category": "warning",
}, },
"new_application_member": { "new_application_member": {
"title": "flash.new_application_member.title", "title": None,
"message": "flash.new_application_member.message", "message": "flash.new_application_member.message",
"category": "success", "category": "success",
}, },

7
translations.yaml
View File

@ -98,8 +98,7 @@ flash:
title: Application invitation error title: Application invitation error
message: There was an error processing the invitation for {user_name} from {application_name} message: There was an error processing the invitation for {user_name} from {application_name}
resent: resent:
title: Application invitation resent message: "{email} has been sent an invitation to access this Application"
message: You have successfully resent the invite for {user_name} from {application_name}
revoked: revoked:
title: Application invitation revoked title: Application invitation revoked
message: You have successfully revoked the invite for {user_name} from {application_name} message: You have successfully revoked the invite for {user_name} from {application_name}
@ -166,11 +165,11 @@ flash:
task_order: task_order:
insufficient_funds: insufficient_funds:
title: Insufficient Funds title: Insufficient Funds
message: ""
submitted: submitted:
title: Your Task Order has been uploaded successfully. title: Your Task Order has been uploaded successfully.
message: Your task order form for {task_order.portfolio_name} has been submitted. message: Your task order form for {task_order.portfolio_name} has been submitted.
new_application_member: 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." 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.' updated_application_team_settings: 'You have updated the {application_name} team settings.'
user: user:
@ -287,7 +286,7 @@ forms:
start_past_contract: PoP start date must be before or on {date}. start_past_contract: PoP start date must be before or on {date}.
start_pre_contract: PoP start date must be on or after {date}. start_pre_contract: PoP start date must be on or after {date}.
clin_funding_errors: clin_funding_errors:
obligated_amount_error: Obligated amount must be less than or equal to total amount obligated_amount_error: Obligated funds can not exceed total CLIN value
funding_range_error: Dollar amount must be from $0.00 to $1,000,000,000.00 funding_range_error: Dollar amount must be from $0.00 to $1,000,000,000.00
validators: validators:
is_number_message: Please enter a valid number. is_number_message: Please enter a valid number.