Merged in [13108] from lars@netapp.com:

levkowetz · levkowetz · commit 5afa53a09d94 · 2017-03-25T23:46:18.000Z
Change \'ID Tracker\' to \'Datatracker\' in various places. Fixes some of ietf-tools#2100. - Legacy-Id: 13136 Note: SVN reference [13108] has been migrated to Git commit afdf154
diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
@@ -23,7 +23,7 @@ def email_state_changed(request, doc, text, mailtrigger_id=None):
     
     text = strip_tags(text)
     send_mail(request, to, None,
-              "ID Tracker State Update Notice: %s" % doc.file_tag(),
+              "Datatracker State Update Notice: %s" % doc.file_tag(),
               "doc/mail/state_changed_email.txt",
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
@@ -134,7 +134,7 @@ def find_event(t):
             self.assertIn("State Update Notice", outbox[-1]['Subject'])
             self.assertIn("ames-chairs@", outbox[-1]['To'])
             body = outbox[-1].get_payload()
-            for word in ["State changed", "ID Tracker URL", ]:
+            for word in ["State changed", "Datatracker URL", ]:
                 self.assertIn(word, body)
 
         by = Person.objects.get(user__username="secretary")
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
@@ -154,7 +154,7 @@ def test_pull_from_rfc_queue(self):
         self.assertTrue("rfc-editor@" in outbox[-1]['To'])
         self.assertTrue("iana@" in outbox[-1]['To'])
 
-        self.assertTrue("ID Tracker State Update Notice:" in outbox[-2]['Subject'])
+        self.assertTrue("Datatracker State Update Notice:" in outbox[-2]['Subject'])
         self.assertTrue("aread@" in outbox[-2]['To'])
         
 
@@ -224,7 +224,7 @@ def test_request_last_call(self):
         # mail notice
         self.assertEqual(len(outbox), 2) 
 
-        self.assertTrue("ID Tracker State Update" in outbox[0]['Subject'])
+        self.assertTrue("Datatracker State Update" in outbox[0]['Subject'])
         self.assertTrue("aread@" in outbox[0]['To'])
 
         self.assertTrue("Last Call:" in outbox[1]['Subject'])
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
@@ -3358,7 +3358,7 @@
   "slug": "pub-req",
   "type": "draft-iesg",
   "order": 10,
-  "desc": "A formal request has been made to advance/publish the document, following the procedures in Section 7.5 of RFC 2418. The request could be from a WG chair, from an individual through the RFC Editor, etc. (The Secretariat (iesg-secretary@ietf.org) is copied on these requests to ensure that the request makes it into the ID tracker.) A document in this state has not (yet) been reviewed by an AD nor has any official action been taken on it yet (other than to note that its publication has been requested."
+  "desc": "A formal request has been made to advance/publish the document, following the procedures in Section 7.5 of RFC 2418. The request could be from a WG chair, from an individual through the RFC Editor, etc. (The Secretariat (iesg-secretary@ietf.org) is copied on these requests to ensure that the request makes it into the Datatracker.) A document in this state has not (yet) been reviewed by an AD nor has any official action been taken on it yet (other than to note that its publication has been requested."
  },
  "model": "doc.state",
  "pk": 16
diff --git a/ietf/secr/drafts/email.py b/ietf/secr/drafts/email.py
@@ -18,7 +18,7 @@ def announcement_from_form(data, **kwargs):
     '''
     # possible overrides
     by = kwargs.get('by',Person.objects.get(name='(System)'))
-    from_val = kwargs.get('from_val','ID Tracker <internet-drafts-reply@ietf.org>')
+    from_val = kwargs.get('from_val','Datatracker <internet-drafts-reply@ietf.org>')
     content_type = kwargs.get('content_type','')
     
     # from the form
diff --git a/ietf/templates/doc/draft/id_expired_email.txt b/ietf/templates/doc/draft/id_expired_email.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{{ doc.file_tag|safe }} was just expired.
-This draft is in the state "{{ state }}" in the ID Tracker.
+This draft is in the state "{{ state }}" in the Datatracker.
 
 
 Thanks,
diff --git a/ietf/templates/doc/mail/change_notice.txt b/ietf/templates/doc/mail/change_notice.txt
@@ -2,7 +2,7 @@
 Please DO NOT reply to this email.
 
 I-D: {{ doc.file_tag|safe }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 
 {{ text }}
 {% endautoescape%}
diff --git a/ietf/templates/doc/mail/comment_added_email.txt b/ietf/templates/doc/mail/comment_added_email.txt
@@ -7,6 +7,6 @@ Please DO NOT reply to this email.
 
 The document can be found at
 I-D: {{ doc.file_tag|safe }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 
 {% endautoescape%}
diff --git a/ietf/templates/doc/mail/email_iesg_processing.txt b/ietf/templates/doc/mail/email_iesg_processing.txt
@@ -10,6 +10,6 @@ The following changes have been made:
 
 The document can be found here:
 I-D: {{ doc.file_tag|safe }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 
 {% endautoescape%}
diff --git a/ietf/templates/doc/mail/intended_status_changed_email.txt b/ietf/templates/doc/mail/intended_status_changed_email.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{{ text }}
 
 The document can be found at
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/resurrect_completed_email.txt b/ietf/templates/doc/mail/resurrect_completed_email.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}As you requsted, the Internet Draft {{ doc.file_tag }}
 has been resurrected.
 
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/resurrect_request_email.txt b/ietf/templates/doc/mail/resurrect_request_email.txt
@@ -1,4 +1,4 @@
 {% autoescape off %}I-D that is requested to be resurrected: {{ doc.file_tag }}
 Requested by: {{ by }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/state_changed_email.txt b/ietf/templates/doc/mail/state_changed_email.txt
@@ -1,3 +1,3 @@
 {% autoescape off %}{{ text }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/stream_changed_email.txt b/ietf/templates/doc/mail/stream_changed_email.txt
@@ -1,3 +1,3 @@
 {% autoescape off %}{{ text }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/update_telechat.txt b/ietf/templates/doc/mail/update_telechat.txt
@@ -1,3 +1,3 @@
 {% autoescape off %}{{ text }}
-ID Tracker URL: {{ url }}
+Datatracker URL: {{ url }}
 {% endautoescape %}
diff --git a/redesign/importing/import-states.py b/redesign/importing/import-states.py
@@ -55,7 +55,7 @@
 State.objects.get_or_create(type=draft_iesg_type, slug="ad-eval", name="AD Evaluation", desc='A specific AD (e.g., the Area Advisor for the WG) has begun reviewing the document to verify that it is ready for advancement. The shepherding AD is responsible for doing any necessary review before starting an IETF Last Call or sending the document directly to the IESG as a whole.', order=11)
 State.objects.get_or_create(type=draft_iesg_type, slug="lc-req", name="Last Call Requested", desc='The AD has requested that the Secretariat start an IETF Last Call, but the the actual Last Call message has not been sent yet.', order=15)
 State.objects.get_or_create(type=draft_iesg_type, slug="lc", name="In Last Call", desc='The document is currently waiting for IETF Last Call to complete. Last Calls for WG documents typically last 2 weeks, those for individual submissions last 4 weeks.', order=16)
-State.objects.get_or_create(type=draft_iesg_type, slug="pub-req", name="Publication Requested", desc='A formal request has been made to advance/publish the document, following the procedures in Section 7.5 of RFC 2418. The request could be from a WG chair, from an individual through the RFC Editor, etc. (The Secretariat (iesg-secretary@ietf.org) is copied on these requests to ensure that the request makes it into the ID tracker.) A document in this state has not (yet) been reviewed by an AD nor has any official action been taken on it yet (other than to note that its publication has been requested.', order=10)
+State.objects.get_or_create(type=draft_iesg_type, slug="pub-req", name="Publication Requested", desc='A formal request has been made to advance/publish the document, following the procedures in Section 7.5 of RFC 2418. The request could be from a WG chair, from an individual through the RFC Editor, etc. (The Secretariat (iesg-secretary@ietf.org) is copied on these requests to ensure that the request makes it into the Datatracker.) A document in this state has not (yet) been reviewed by an AD nor has any official action been taken on it yet (other than to note that its publication has been requested.', order=10)
 State.objects.get_or_create(type=draft_iesg_type, slug="rfcqueue", name="RFC Ed Queue", desc='The document is in the RFC editor Queue (as confirmed by http://www.rfc-editor.org/queue.html).', order=31)
 State.objects.get_or_create(type=draft_iesg_type, slug="defer", name="IESG Evaluation - Defer", desc='During a telechat, one or more ADs requested an additional 2 weeks to review the document. A defer is designed to be an exception mechanism, and can only be invoked once, the first time the document comes up for discussion during a telechat.', order=21)
 State.objects.get_or_create(type=draft_iesg_type, slug="writeupw", name="Waiting for Writeup", desc='Before a standards-track or BCP document is formally considered by the entire IESG, the AD must write up a protocol action. The protocol action is included in the approval message that the Secretariat sends out when the document is approved for publication as an RFC.', order=18)
