diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 275f67bb3..cec84fd01 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -784,7 +784,8 @@ class DomainAdmin(ListHeaderAdmin):
else:
self.message_user(
request,
- ("Domain statuses are %s" ". Thanks!") % statuses,
+ f"The registry statuses are {statuses}. "
+ "These statuses are from the EPP provider of the .gov registry."
)
return HttpResponseRedirect(".")
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index ac26fc922..2ed3d7532 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -13,10 +13,10 @@
{% elif original.state == original.State.ON_HOLD %}
{% endif %}
-
-
+
+
{% if original.state != original.State.DELETED %}
-
+
{% endif %}
{{ block.super }}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index def475536..a317bdf3b 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -108,12 +108,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -148,12 +148,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the error
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -193,12 +193,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -220,7 +220,7 @@ class TestDomainAdmin(MockEppLib):
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client