From 06d87b409701809163f720ca6bc61125b9f06c7f Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 24 Aug 2023 16:19:30 +0300 Subject: [PATCH] fix: Reword I-D announcement emails to make first sentence more useful (#6193) Fixes #6092 --- ietf/templates/submit/announce_to_authors.txt | 35 +++++++++---------- ietf/templates/submit/announce_to_lists.txt | 21 +++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index 7622cb969..e3359bb60 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -1,24 +1,23 @@ -{% autoescape off %} -A new version of I-D, {{ submission.name }}-{{ submission.rev }}.txt -has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the -IETF repository. +{% autoescape off %}{% filter wordwrap:78 %}A new version of Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the +IETF repository.{% endfilter %} -Name: {{ submission.name }} -Revision: {{ submission.rev }} -Title: {{ submission.title }} -Document date: {{ submission.document_date|date:"Y-m-d" }} -Group: {{ group }} -Pages: {{ submission.pages }} -URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt -Status: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %} -Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %} -Htmlized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %} -{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} +Name: {{ submission.name }} +Revision: {{ submission.rev }} +Title: {{ submission.title }} +Date: {{ submission.document_date|date:"Y-m-d" }} +Group: {{ group }} +Pages: {{ submission.pages }} +URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt +Status: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %} +HTML: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %} +HTMLized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %} +{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} Abstract: -{{ submission.abstract }} - -{{ submission.note|default:"" }} + +{{ submission.abstract.rstrip }} + +{{ submission.note.rstrip|default:"" }} The IETF Secretariat {% endautoescape %} diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index b45c4a1eb..d7a3739af 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -1,14 +1,14 @@ -{% autoescape off %} -{% filter wordwrap:78 %}A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group %} This Internet-Draft is a work item of the {{ submission.group.name }} ({{ submission.group.acronym|upper }}){% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}{% endfilter %} +{% autoescape off %}{% filter wordwrap:78 %}Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt is now available.{% if submission.group %} It is a work item of the {{ submission.group.name }} ({{ submission.group.acronym|upper }}){% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}{% endfilter %} - Title : {{ submission.title }} - Author{{ submission.authors|pluralize:" ,s" }} : {% for author in submission.authors %}{{ author.name }}{% if not forloop.last %} - {% endif %}{% endfor %} - Filename : {{ submission.name }}-{{ submission.rev }}.txt - Pages : {{ submission.pages }} - Date : {{ submission.submission_date|date:"Y-m-d" }} + Title: {{ submission.title }} + Author{{ submission.authors|pluralize:",s" }}: {% if submission.authors|length == 1 %} {% endif %}{% for author in submission.authors %}{{ author.name }}{% if not forloop.last %} + {% endif %}{% endfor %} + Name: {{ submission.name }}-{{ submission.rev }}.txt + Pages: {{ submission.pages }} + Dates: {{ submission.submission_date|date:"Y-m-d" }} Abstract: + {{ submission.abstract.rstrip }} The IETF datatracker status page for this Internet-Draft is: @@ -16,11 +16,12 @@ The IETF datatracker status page for this Internet-Draft is: {% if submission.xml_version == "3" %} There is also an HTML version available at: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %} -There is also an htmlized version available at: +There is also an HTMLized version available at: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name rev=submission.rev %}{% endif %} {% if submission.rev != "00" %} A diff from the previous version is available at: {{settings.RFCDIFF_BASE_URL}}?url2={{ submission.name }}-{{ submission.rev }} {% endif %} -Internet-Drafts are also available by rsync at rsync.ietf.org::internet-drafts +Internet-Drafts are also available by rsync at: +rsync.ietf.org::internet-drafts {% endautoescape %}