fix: use Internet-Draft more consistently across the UI (ietf-tools#5104)

* s/Internet Draft/Internet-Draft/i

* s/draft/Internet-Draft/i or s/draft/I-D/i

* s/ID/I-D/

* Fix tests

* a -> an

* Undo case-change to ASCII

* Address code review comments

* Add migrations

* Add merged migration

* fix: straighten out migrations

* fix: finish straightening out migrations

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>

Author: larseggert

bin/daily

@@ -42,7 +42,7 @@ $DTDIR/ietf/manage.py populate_yang_model_dirs -v0
 # Re-run yang checks on active documents
 $DTDIR/ietf/manage.py run_yang_model_checks -v0
 
-# Expire internet drafts
+# Expire Internet-Drafts
 # Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
 $DTDIR/ietf/bin/expire-ids
 

ietf/checks.py

@@ -114,7 +114,7 @@ def check_id_submission_directories(app_configs, **kwargs):
         p = getattr(settings, s)
         if not os.path.exists(p):
             errors.append(checks.Critical(
-                "A directory used by the ID submission tool does not\n"
+                "A directory used by the I-D submission tool does not\n"
                 "exist at the path given in the settings file.  The setting is:\n"
                 "    %s = %s" % (s, p),
                 hint = ("Please either update the local settings to point at the correct\n"
@@ -134,7 +134,7 @@ def check_id_submission_files(app_configs, **kwargs):
         p = getattr(settings, s)
         if not os.path.exists(p):
             errors.append(checks.Critical(
-                "A file used by the ID submission tool does not exist\n"
+                "A file used by the I-D submission tool does not exist\n"
                 "at the path given in the settings file.  The setting is:\n"
                 "    %s = %s" % (s, p),
                 hint = ("Please either update the local settings to point at the correct\n"
@@ -179,7 +179,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
         except Exception as e:
             errors.append(checks.Critical(
                 "An exception was raised when trying to import the\n"
-                "draft submission checker class '%s':\n    %s" % (checker_path, e),
+                "Internet-Draft submission checker class '%s':\n    %s" % (checker_path, e),
                 hint = "Please check that the class exists and can be imported.\n",
                 id = "datatracker.E0008",
             ))
@@ -188,15 +188,15 @@ def check_id_submission_checkers(app_configs, **kwargs):
         except Exception as e:
             errors.append(checks.Critical(
                 "An exception was raised when trying to instantiate\n"
-                "the draft submission checker class '%s':\n    %s" % (checker_path, e),
+                "the Internet-Draft submission checker class '%s':\n    %s" % (checker_path, e),
                 hint = "Please check that the class can be instantiated.\n",
                 id = "datatracker.E0009",
             ))
             continue
         for attr in ('name',):
             if not hasattr(checker, attr):
                 errors.append(checks.Critical(
-                    "The draft submission checker\n    '%s'\n"
+                    "The Internet-Draft submission checker\n    '%s'\n"
                     "has no attribute '%s', which is required" % (checker_path, attr),
                     hint = "Please update the class.\n",
                     id = "datatracker.E0010",
@@ -207,7 +207,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
                 break
         else:
             errors.append(checks.Critical(
-                "The draft submission checker\n    '%s'\n"
+                "The Internet-Draft submission checker\n    '%s'\n"
                 " has no recognised checker method;  "
                 "should be one or more of %s." % (checker_path, checker_methods),
                 hint = "Please update the class.\n",

ietf/community/forms.py

@@ -13,7 +13,7 @@
 from ietf.person.fields import SearchablePersonField
 
 class AddDocumentsForm(forms.Form):
-    documents = SearchableDocumentsField(label="Add documents to track", doc_type="draft")
+    documents = SearchableDocumentsField(label="Add Internet-Drafts to track", doc_type="draft")
 
 class SearchRuleTypeForm(forms.Form):
     rule_type = forms.ChoiceField(choices=[('', '--------------')] + SearchRule.RULE_TYPES)

ietf/community/models.py

@@ -19,11 +19,11 @@ class CommunityList(models.Model):
 
     def long_name(self):
         if self.user:
-            return 'Personal ID list of %s' % self.user.username
+            return 'Personal I-D list of %s' % self.user.username
         elif self.group:
-            return 'ID list for %s' % self.group.name
+            return 'I-D list for %s' % self.group.name
         else:
-            return 'ID list'
+            return 'I-D list'
 
     def __str__(self):
         return self.long_name()

ietf/doc/expire.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-# expiry of Internet Drafts
+# expiry of Internet-Drafts
 
 
 from django.conf import settings
@@ -179,7 +179,7 @@ def expire_draft(doc):
     doc.save_with_history(events)
 
 def clean_up_draft_files():
-    """Move unidentified and old files out of the Internet Draft directory."""
+    """Move unidentified and old files out of the Internet-Draft directory."""
     cut_off = date_today(DEADLINE_TZINFO)
 
     pattern = os.path.join(settings.INTERNET_DRAFT_PATH, "draft-*.*")

ietf/doc/forms.py

@@ -140,7 +140,7 @@ class AddDownrefForm(forms.Form):
                 required=True)
     drafts = SearchableDocAliasesField(
                 label="Internet-Drafts that makes the reference",
-                help_text="The drafts that approve the downref in their Last Call",
+                help_text="The Internet-Drafts that approve the downref in their Last Call",
                 required=True)
 
     def clean_rfc(self):
@@ -163,7 +163,7 @@ def clean_drafts(self):
             if not state or state.slug not in IESG_APPROVED_STATE_LIST:
                 v_err_names.append(da.name)
         if v_err_names:
-            raise forms.ValidationError("Draft is not yet approved: " + ", ".join(v_err_names))
+            raise forms.ValidationError("Internet-Draft is not yet approved: " + ", ".join(v_err_names))
         return drafts
 
     def clean(self):

ietf/doc/lastcall.py

@@ -1,4 +1,4 @@
-# helpers for handling last calls on Internet Drafts
+# helpers for handling last calls on Internet-Drafts
 
 from django.db.models import Q
 
@@ -73,4 +73,4 @@ def expire_last_call(doc):
     if doc.type_id == 'draft':
         lc_text = doc.latest_event(LastCallDocEvent, type="sent_last_call").desc
         if "document makes the following downward references" in lc_text:
-            email_last_call_expired_with_downref(doc, lc_text)           
+            email_last_call_expired_with_downref(doc, lc_text)           

ietf/doc/mails.py

@@ -98,7 +98,7 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""):
     text = strip_tags(text)
 
     send_mail(request, to, None,
-              "ID Tracker Stream Change Notice: %s" % doc.file_tag(),
+              "I-D Tracker Stream Change Notice: %s" % doc.file_tag(),
               "doc/mail/stream_changed_email.txt",
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),
@@ -288,7 +288,7 @@ def generate_approval_mail_approved(request, doc):
     else:
         contacts = "The IESG contact person is %s." % responsible_directors[0]
 
-    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
+    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet-Draft"
 
     addrs = gather_address_lists('ballot_approved_ietf_stream',doc=doc).as_strings()
     return render_to_string("doc/mail/approval_mail.txt",
@@ -308,7 +308,7 @@ def generate_approval_mail_rfc_editor(request, doc):
     # This is essentially dead code - it is only exercised if the IESG ballots on some other stream's document,
     # which does not happen now that we have conflict reviews.
     disapproved = doc.get_state_slug("draft-iesg") in DO_NOT_PUBLISH_IESG_STATES
-    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
+    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet-Draft"
     addrs = gather_address_lists('ballot_approved_conflrev', doc=doc).as_strings()
 
     return render_to_string("doc/mail/approval_mail_rfc_editor.txt",

ietf/doc/management/commands/generate_draft_bibxml_files.py

@@ -22,7 +22,7 @@
 class Command(BaseCommand):
     help = ('Generate draft bibxml files for xml2rfc references, placing them in the '
             'directory configured in settings.BIBXML_BASE_PATH: %s.  '
-            'By default, generate files as needed for new draft revisions from the '
+            'By default, generate files as needed for new Internet-Draft revisions from the '
             'last %s days.' % (settings.BIBXML_BASE_PATH, DEFAULT_DAYS))
 
     def add_arguments(self, parser):

ietf/doc/templatetags/mail_filters.py

@@ -9,7 +9,7 @@ def std_level_prompt(doc):
     to the object's intended_std_level (with the word RFC appended in some
     cases), or a prompt requesting that the intended_std_level be set."""
 
-    prompt = "*** YOU MUST SELECT AN INTENDED STATUS FOR THIS DRAFT AND REGENERATE THIS TEXT ***"
+    prompt = "*** YOU MUST SELECT AN INTENDED STATUS FOR THIS INTERNET-DRAFT AND REGENERATE THIS TEXT ***"
 
     if doc.intended_std_level:
        prompt = doc.intended_std_level.name