From 6f85f6de970a0c0e4b1885d42f07ef2a8ea32453 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 20 Jan 2020 15:45:59 -0500
Subject: [PATCH] Update copy for invite alert messages, CLIN error message,
 and use translations in flash file

---
 atst/routes/applications/settings.py | 6 +-----
 atst/utils/flash.py                  | 6 +++---
 translations.yaml                    | 7 +++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 91676cfb..ed45fe2e 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -509,11 +509,7 @@ def resend_invite(application_id, application_role_id):
             token=new_invite.token,
         )
 
-        flash(
-            "application_invite_resent",
-            user_name=new_invite.user_name,
-            application_name=app_role.application.name,
-        )
+        flash("application_invite_resent", email=new_invite.email)
     else:
         flash(
             "application_invite_error",
diff --git a/atst/utils/flash.py b/atst/utils/flash.py
index 7a1cf4ce..fab79939 100644
--- a/atst/utils/flash.py
+++ b/atst/utils/flash.py
@@ -29,7 +29,7 @@ MESSAGES = {
         "category": "error",
     },
     "application_invite_resent": {
-        "title": "flash.application_invite.resent.title",
+        "title": "",
         "message": "flash.application_invite.resent.message",
         "category": "success",
     },
@@ -90,7 +90,7 @@ MESSAGES = {
     },
     "insufficient_funds": {
         "title": "flash.task_order.insufficient_funds.title",
-        "message": "",
+        "message": "flash.task_order.insufficient_funds.message",
         "category": "warning",
     },
     "logged_out": {
@@ -104,7 +104,7 @@ MESSAGES = {
         "category": "warning",
     },
     "new_application_member": {
-        "title": "flash.new_application_member.title",
+        "title": None,
         "message": "flash.new_application_member.message",
         "category": "success",
     },
diff --git a/translations.yaml b/translations.yaml
index 820078eb..350aa566 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -98,8 +98,7 @@ flash:
       title: Application invitation error
       message: There was an error processing the invitation for {user_name} from {application_name}
     resent:
-      title: Application invitation resent
-      message: You have successfully resent the invite for {user_name} from {application_name}
+      message: "{email} has been sent an invitation to access this Application"
     revoked:
       title: Application invitation revoked
       message: You have successfully revoked the invite for {user_name} from {application_name}
@@ -166,11 +165,11 @@ flash:
   task_order:
     insufficient_funds:
       title: Insufficient Funds
+      message: ""
     submitted:
       title: Your Task Order has been uploaded successfully.
       message: Your task order form for {task_order.portfolio_name} has been submitted.
   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.'
   user:
@@ -287,7 +286,7 @@ forms:
       start_past_contract: PoP start date must be before or on {date}.
       start_pre_contract: PoP start date must be on or after {date}.
     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
   validators:
     is_number_message: Please enter a valid number.