Skip to content

Commit 8d259d6

Browse files
committed
Add a clean_whitespace filter in some places to get rid of any newlines embedded in document titles.
- Legacy-Id: 2792
1 parent ef26a18 commit 8d259d6

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

ietf/templates/idrfc/approval_mail.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
1+
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: IETF-Announce <ietf-announce@ietf.org>{% if cc %}
33
Cc: {{ cc }}{% endif %}
4-
Subject: {{ action_type }} Action: '{{ doc.title }}' to {{ status }} ({{ doc.filename_with_rev }})
4+
Subject: {{ action_type }} Action: '{{ doc.title|clean_whitespace }}' to {{ status }} ({{ doc.filename_with_rev }})
55

66
{% filter wordwrap:73 %}The IESG has approved the following document{{ docs|pluralize }}:{% for d in docs %}
77
- '{{ d.filled_title }}'

ietf/templates/idrfc/approval_mail_rfc_editor.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From: The IESG <iesg-secretary@ietf.org>
1+
{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: RFC Editor <rfc-editor@rfc-editor.org>
33
Cc: The IESG <iesg@ietf.org>, <iana@iana.org>, <ietf-announce@ietf.org>
4-
Subject: Re: {{ status }} to be: {{ doc.file_tag|safe }}
4+
Subject: Re: {{ status }} to be: {{ doc.file_tag }}
55
{% filter wordwrap:73 %}{% if disapproved %}
66
The IESG recommends that '{{ doc.title }}' {{ doc.file_tag|safe }} NOT be published as {{ full_status }}.
77
{% else %}
@@ -18,3 +18,4 @@ Thank you,
1818

1919
The IESG Secretary
2020
{% endfilter %}
21+
{% endautoescape %}
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
From: The IESG <iesg-secretary@ietf.org>
1+
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: IETF-Announce <ietf-announce@ietf.org>{% if cc %}
3-
CC: {{ cc|safe }}{% endif %}
3+
CC: {{ cc }}{% endif %}
44
Reply-To: ietf@ietf.org
5-
Subject: Last Call: {{ doc.file_tag|safe }} ({{ doc.title }}) to {{ status }}
5+
Subject: Last Call: {{ doc.file_tag }} ({{ doc.title|clean_whitespace }}) to {{ status }}
66

77
{% filter wordwrap:73 %}
88
The IESG has received a request from {{ group }} to consider the following document{{ docs|pluralize }}:{% for d in docs %}
99
- '{{ d.filled_title }}'
10-
{{ d.file_tag|safe }} as {{ d.full_status }}{% endfor %}
10+
{{ d.file_tag }} as {{ d.full_status }}{% endfor %}
1111

1212
The IESG plans to make a decision in the next few weeks, and solicits final comments on this action. Please send substantive comments to the ietf@ietf.org mailing lists by {{ expiration_date }}. Exceptionally, comments may be sent to iesg@ietf.org instead. In either case, please retain the beginning of the Subject line to allow automated sorting.{% endfilter %}
1313

@@ -18,4 +18,5 @@ Implementation Report can be accessed at
1818
http://www.ietf.org/iesg/implementation.html
1919
{% endif %}
2020
IESG discussion can be tracked via
21-
{{ doc_url|safe }}
21+
{{ doc_url }}
22+
{% endautoescape %}

0 commit comments

Comments
 (0)