Merge pull request #1467 from cisagov/dk/1388-ds-data-naming

Issue #1388 - changed DS Data to DS data in all places

src/registrar/forms/common.py

@@ -1,6 +1,6 @@
 # common.py
 #
-# ALGORITHM_CHOICES are options for alg attribute in DS Data
+# ALGORITHM_CHOICES are options for alg attribute in DS data
 # reference:
 # https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml
 ALGORITHM_CHOICES = [
@@ -18,7 +18,7 @@ ALGORITHM_CHOICES = [
     (15, "(15) Ed25519"),
     (16, "(16) Ed448"),
 ]
-# DIGEST_TYPE_CHOICES are options for digestType attribute in DS Data
+# DIGEST_TYPE_CHOICES are options for digestType attribute in DS data
 # reference: https://datatracker.ietf.org/doc/html/rfc4034#appendix-A.2
 DIGEST_TYPE_CHOICES = [
     (1, "(1) SHA-1"),

src/registrar/forms/domain.py

@@ -302,7 +302,7 @@ class DomainDnssecForm(forms.Form):
 
 
 class DomainDsdataForm(forms.Form):
-    """Form for adding or editing DNSSEC DS Data to a domain."""
+    """Form for adding or editing DNSSEC DS data to a domain."""
 
     def validate_hexadecimal(value):
         """

src/registrar/templates/domain_dsdata.html

@@ -1,13 +1,13 @@
 {% extends "domain_base.html" %}
 {% load static field_helpers url_helpers %}
 
-{% block title %}DS Data | {{ domain.name }} | {% endblock %}
+{% block title %}DS data | {{ domain.name }} | {% endblock %}
 
 {% block domain_content %}
   {% if domain.dnssecdata is None %}
   <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
     <div class="usa-alert__body">
-      You have no DS Data added. Enable DNSSEC by adding DS Data.
+      You have no DS data added. Enable DNSSEC by adding DS data.
     </div>
   </div>
   {% endif %}
@@ -16,11 +16,11 @@
     {% include "includes/form_errors.html" with form=form %}
   {% endfor %}
 
-  <h1>DS Data</h1>
+  <h1>DS data</h1>
 
   <p>In order to enable DNSSEC, you must first configure it with your DNS hosting service.</p>
 
-  <p>Enter the values given by your DNS provider for DS Data.</p>
+  <p>Enter the values given by your DNS provider for DS data.</p>
 
   {% include "includes/required_fields.html" %}
 
@@ -31,9 +31,9 @@
     {% for form in formset %}
     <fieldset class="repeatable-form">
 
-      <legend class="sr-only">DS Data record {{forloop.counter}}</legend>
+      <legend class="sr-only">DS data record {{forloop.counter}}</legend>
 
-      <h2 class="margin-top-0">DS Data record {{forloop.counter}}</h2>
+      <h2 class="margin-top-0">DS data record {{forloop.counter}}</h2>
 
       <div class="grid-row grid-gap-2 flex-end">
         <div class="tablet:grid-col-4">

src/registrar/templates/domain_sidebar.html

@@ -44,7 +44,7 @@
                   <a href="{{ url }}"
                     {% if request.path == url %}class="usa-current"{% endif %}
                   >
-                      DS Data
+                      DS data
                   </a>
                 </li>
               </ul>

src/registrar/tests/test_views.py

@@ -1941,19 +1941,19 @@ class TestDomainDNSSEC(TestDomainOverview):
         self.assertContains(updated_page, "Enable DNSSEC")
 
     def test_ds_form_loads_with_no_domain_data(self):
-        """DNSSEC Add DS Data page loads when there is no
+        """DNSSEC Add DS data page loads when there is no
         domain DNSSEC data and shows a button to Add new record"""
 
         page = self.client.get(reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dnssec_none.id}))
-        self.assertContains(page, "You have no DS Data added")
+        self.assertContains(page, "You have no DS data added")
         self.assertContains(page, "Add new record")
 
     def test_ds_form_loads_with_ds_data(self):
-        """DNSSEC Add DS Data page loads when there is
+        """DNSSEC Add DS data page loads when there is
         domain DNSSEC DS data and shows the data"""
 
         page = self.client.get(reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id}))
-        self.assertContains(page, "DS Data record 1")
+        self.assertContains(page, "DS data record 1")
 
     def test_ds_data_form_modal(self):
         """When user clicks on save, a modal pops up."""
@@ -1974,7 +1974,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         self.assertContains(response, "Trigger Disable DNSSEC Modal")
 
     def test_ds_data_form_submits(self):
-        """DS Data form submits successfully
+        """DS data form submits successfully
 
         Uses self.app WebTest because we need to interact with forms.
         """
@@ -1991,10 +1991,10 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         page = result.follow()
-        self.assertContains(page, "The DS Data records for this domain have been updated.")
+        self.assertContains(page, "The DS data records for this domain have been updated.")
 
     def test_ds_data_form_invalid(self):
-        """DS Data form errors with invalid data (missing required fields)
+        """DS data form errors with invalid data (missing required fields)
 
         Uses self.app WebTest because we need to interact with forms.
         """
@@ -2017,7 +2017,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         self.assertContains(result, "Digest is required", count=2, status_code=200)
 
     def test_ds_data_form_invalid_keytag(self):
-        """DS Data form errors with invalid data (key tag too large)
+        """DS data form errors with invalid data (key tag too large)
 
         Uses self.app WebTest because we need to interact with forms.
         """
@@ -2040,7 +2040,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
 
     def test_ds_data_form_invalid_digest_chars(self):
-        """DS Data form errors with invalid data (digest contains non hexadecimal chars)
+        """DS data form errors with invalid data (digest contains non hexadecimal chars)
 
         Uses self.app WebTest because we need to interact with forms.
         """
@@ -2063,7 +2063,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
 
     def test_ds_data_form_invalid_digest_sha1(self):
-        """DS Data form errors with invalid data (digest is invalid sha-1)
+        """DS data form errors with invalid data (digest is invalid sha-1)
 
         Uses self.app WebTest because we need to interact with forms.
         """
@@ -2086,7 +2086,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
 
     def test_ds_data_form_invalid_digest_sha256(self):
-        """DS Data form errors with invalid data (digest is invalid sha-256)
+        """DS data form errors with invalid data (digest is invalid sha-256)
 
         Uses self.app WebTest because we need to interact with forms.
         """

src/registrar/views/domain.py

@@ -434,7 +434,7 @@ class DomainDsDataView(DomainFormBaseView):
         return initial_data
 
     def get_success_url(self):
-        """Redirect to the DS Data page for the domain."""
+        """Redirect to the DS data page for the domain."""
         return reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.object.pk})
 
     def get_context_data(self, **kwargs):
@@ -473,7 +473,7 @@ class DomainDsDataView(DomainFormBaseView):
             modal_button = (
                 '<button type="submit" '
                 'class="usa-button usa-button--secondary" '
-                'name="disable-override-click">Remove all DS Data</button>'
+                'name="disable-override-click">Remove all DS data</button>'
             )
 
             # context to back out of a broken form on all fields delete
@@ -523,7 +523,7 @@ class DomainDsDataView(DomainFormBaseView):
                 logger.error(f"Registry error: {err}")
             return self.form_invalid(formset)
         else:
-            messages.success(self.request, "The DS Data records for this domain have been updated.")
+            messages.success(self.request, "The DS data records for this domain have been updated.")
             # superclass has the redirect
             return super().form_valid(formset)