Mr/request form edits (#465)

* Update "current website" text

* Update tribal gov text about needing more info

* Add more context about current domains being used

* RM text saying we'll email other contacts about the request

* RM reference to emailing other contacts

* Fix linter and test failures

* Updated wait time to 20 business days

---------

Co-authored-by: Seamus Johnston <seamus.johnston@gsa.gov>

src/registrar/forms/application_wizard.py

@@ -187,12 +187,13 @@ class TribalGovernmentForm(RegistrarForm):
                 # into a link. There should be no user-facing input in the
                 # HTML indicated here.
                 mark_safe(  # nosec
+                    "You can’t complete this application yet. "
                     "Only tribes recognized by the U.S. federal government "
                     "or by a U.S. state government are eligible for .gov "
-                    'domains. Please <a href="{}">tell us more '
+                    'domains. Please use our <a href="{}">contact form</a> to '
-                    "about your tribe and why you want a .gov domain</a>.".format(
+                    "tell us more about your tribe and why you want a .gov "
-                        todo_url
+                    "domain. We’ll review your information and get back "
-                    )
+                    "to you.".format(todo_url)
                 ),
                 code="invalid",
             )
@@ -403,7 +404,7 @@ class CurrentSitesForm(RegistrarForm):
         label="Public website",
         error_messages={
             "invalid": (
-                "Enter your organization's website in the required format, like"
+                "Enter your organization's current website in the required format, like"
                 " www.city.com."
             )
         },

src/registrar/management/commands/lint.py

@@ -48,7 +48,7 @@ class Command(BaseCommand):
             errors = []
             for linter in self.linters.values():
                 self.stdout.write(f"[manage.py lint] {linter['purpose']}. . .")
-                result = run(linter["args"])
+                result = run(linter["args"])  # nosec
                 if result.returncode:
                     self.stderr.write(
                         self.style.NOTICE(

src/registrar/templates/application_current_sites.html

@@ -3,7 +3,8 @@
 
 {% block form_instructions %}
   <p>Enter your organization’s current public website, if you have one. For example,
-  www.city.com.</p>
+  www.city.com. We can better evaluate your domain request if we know about domains 
+you’re already using. If you already have any .gov domains please include them.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

src/registrar/templates/application_done.html

@@ -12,14 +12,13 @@
         alt="Check mark confirming submission"
         width="56"
         />
-    <h1>Thank you</h1>
+    <h1>Thanks for your domain request!</h1>
   </span>
-  <p>We'll email a copy of your request to you,
+  <p>We'll email a copy of your request to you.</p>
-  your authorizing official, and any contacts you added.</p>
 
   <h2>Next steps in this process</h2>
 
-  <p> We'll review your request. This could take up to two weeks. During
+  <p> We'll review your request. This usually takes 20 business days. During
   this review we'll verify that your:</p> 
   <ul class="usa-list">
     <li>Organization is eligible for a .gov domain</li>

src/registrar/templates/application_other_contacts.html

@@ -4,7 +4,6 @@
 {% block form_instructions %}
   <p>We’d like to contact other employees in your organization about your domain request. For example, they could be involved in managing your organization or its technical infrastructure. <strong>This information will help us assess your eligibility for a .gov domain.</strong> These contacts should be in addition to you and your authorizing official. They should be employees of your organization.</p>
 
-  <p>We’ll email these contacts to let them know that you made this request.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

src/registrar/tests/test_forms.py

@@ -32,8 +32,8 @@ class TestFormValidation(TestCase):
         self.assertEqual(
             form.errors["website"],
             [
-                "Enter your organization's"
+                "Enter your organization's current website in the required format, like"
-                " website in the required format, like www.city.com."
+                " www.city.com."
             ],
         )