From 789ac91eeb6c89578bd1d64bc8cee717cc283268 Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Fri, 17 Mar 2023 13:03:37 -0400 Subject: [PATCH] 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 --- src/registrar/forms/application_wizard.py | 11 ++++++----- src/registrar/management/commands/lint.py | 2 +- .../templates/application_current_sites.html | 3 ++- src/registrar/templates/application_done.html | 7 +++---- .../templates/application_other_contacts.html | 1 - src/registrar/tests/test_forms.py | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 43a59dfb0..ce3ef6e9f 100644 --- a/src/registrar/forms/application_wizard.py +++ b/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 tell us more ' - "about your tribe and why you want a .gov domain.".format( - todo_url - ) + 'domains. Please use our contact form to ' + "tell us more about your tribe and why you want a .gov " + "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." ) }, diff --git a/src/registrar/management/commands/lint.py b/src/registrar/management/commands/lint.py index 34975b8e6..3d0ec0225 100644 --- a/src/registrar/management/commands/lint.py +++ b/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( diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html index 19359e7be..627727ae3 100644 --- a/src/registrar/templates/application_current_sites.html +++ b/src/registrar/templates/application_current_sites.html @@ -3,7 +3,8 @@ {% block form_instructions %}

Enter your organization’s current public website, if you have one. For example, - www.city.com.

+ 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.

{% endblock %} {% block form_required_fields_help_text %} diff --git a/src/registrar/templates/application_done.html b/src/registrar/templates/application_done.html index 4b270c0ee..5df03d698 100644 --- a/src/registrar/templates/application_done.html +++ b/src/registrar/templates/application_done.html @@ -12,14 +12,13 @@ alt="Check mark confirming submission" width="56" /> -

Thank you

+

Thanks for your domain request!

-

We'll email a copy of your request to you, - your authorizing official, and any contacts you added.

+

We'll email a copy of your request to you.

Next steps in this process

-

We'll review your request. This could take up to two weeks. During +

We'll review your request. This usually takes 20 business days. During this review we'll verify that your: