altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Add a clean_whitespace filter in some places to get rid of any newlines embedded in document titles.

Browse source 
- Legacy-Id: 2792
This commit is contained in:
Henrik Levkowetz 2011-02-02 15:09:03 +00:00
parent ef26a18076
commit 8d259d6c4c
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/templates/idrfc/approval_mail.txt
View file

@ -1,7 +1,7 @@
{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: IETF-Announce <ietf-announce@ietf.org>{% if cc %}
Cc: {{ cc }}{% endif %}
Subject: {{ action_type }} Action: '{{ doc.title }}' to {{ status }} ({{ doc.filename_with_rev }})
Subject: {{ action_type }} Action: '{{ doc.title|clean_whitespace }}' to {{ status }} ({{ doc.filename_with_rev }})
{% filter wordwrap:73 %}The IESG has approved the following document{{ docs|pluralize }}:{% for d in docs %}
- '{{ d.filled_title }}'

5
ietf/templates/idrfc/approval_mail_rfc_editor.txt
View file

@ -1,7 +1,7 @@
From: The IESG <iesg-secretary@ietf.org>
{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: RFC Editor <rfc-editor@rfc-editor.org>
Cc: The IESG <iesg@ietf.org>, <iana@iana.org>, <ietf-announce@ietf.org>
Subject: Re: {{ status }} to be: {{ doc.file_tag|safe }}
Subject: Re: {{ status }} to be: {{ doc.file_tag }}
{% filter wordwrap:73 %}{% if disapproved %}
The IESG recommends that '{{ doc.title }}' {{ doc.file_tag|safe }} NOT be published as {{ full_status }}.
{% else %}
@ -18,3 +18,4 @@ Thank you,
The IESG Secretary
{% endfilter %}
{% endautoescape %}

11
ietf/templates/idrfc/last_call_announcement.txt
View file

@ -1,13 +1,13 @@
From: The IESG <iesg-secretary@ietf.org>
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: IETF-Announce <ietf-announce@ietf.org>{% if cc %}
CC: {{ cc|safe }}{% endif %}
CC: {{ cc }}{% endif %}
Reply-To: ietf@ietf.org
Subject: Last Call: {{ doc.file_tag|safe }} ({{ doc.title }}) to {{ status }}
Subject: Last Call: {{ doc.file_tag }} ({{ doc.title|clean_whitespace }}) to {{ status }}
{% filter wordwrap:73 %}
The IESG has received a request from {{ group }} to consider the following document{{ docs|pluralize }}:{% for d in docs %}
- '{{ d.filled_title }}'
{{ d.file_tag|safe }} as {{ d.full_status }}{% endfor %}
{{ d.file_tag }} as {{ d.full_status }}{% endfor %}
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 %}
@ -18,4 +18,5 @@ Implementation Report can be accessed at
http://www.ietf.org/iesg/implementation.html
{% endif %}
IESG discussion can be tracked via
{{ doc_url|safe }}
{{ doc_url }}
{% endautoescape %}