From 94373f291561875be185dd4f2ff6ef244c335372 Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@fenron.net>
Date: Mon, 18 Jun 2007 22:54:15 +0000
Subject: [PATCH] Use humanize for the "th" suffix for the IETF meeting number.
Capitalize day names.
Don't repeat the month unless necessary and the year at all of
the meeting dates.
Still missing: group type (e.g., "WG" or "BOF")
- Legacy-Id: 522
---
ietf/settings.py | 1 +
ietf/templates/meeting/agenda.html | 13 +++++++------
ietf/templates/meeting/agenda.txt | 9 +++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ietf/settings.py b/ietf/settings.py
index f8fae1791..1b2b65f90 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -106,6 +106,7 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
+ 'django.contrib.humanize',
'ietf.agenda',
'ietf.announcements',
'ietf.idindex',
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 0ac2faca5..7888fcf4f 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -1,12 +1,13 @@
{% extends "base.html" %}
-{% block title %} Meeting Agenda of IETF {{ meeting_num }} {% endblock %}
+{% load humanize %}
+{% block title %} Meeting Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endblock %}
{% block body_attributes %}background="http://www.ietf.org/meetings/peachbkg.gif"{% endblock %}
{% block content %}
<center>
-<strong> Agenda of the {{ meeting_num }}th IETF Meeting </strong> <br/>
-<strong> {{ meeting_info.start_date|date:"F j, Y" }} - {{ meeting_info.end_date|date:"F j, Y" }} </strong><br />
-Updated As of : {% now "F j, Y" %}<br />
+<strong> Agenda of the {{ meeting_num|ordinal }} IETF Meeting </strong> <br/>
+<strong>{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }} </strong><br />
+Updated As of {% now "F j, Y" %}<br />
</center>
<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a> <br />
@@ -14,7 +15,7 @@ Updated As of : {% now "F j, Y" %}<br />
*** Click on an acronym of the group to get a charter page *** <br />
*** Click on a name of the group to get a meeting agenda *** <br />
</P>
-<p><b>{{ meeting_info.start_date|date:"l, F j, Y" }}</b><br>
+<p><b>{{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }}</b><br>
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}
<br>
{% for item in qs_sun %}
@@ -23,7 +24,7 @@ Updated As of : {% now "F j, Y" %}<br />
<br>
{% regroup object_list by day_id as days %}
{% for day in days %}
- <b>{{ day.list.0.meeting_date|date:"l, F j, Y" }} </b><br>
+ <b>{{ day.list.0.meeting_date|date:"l"|upper }}, {{ day.list.0.meeting_date|date:"F j, Y" }} </b><br>
{% if day.list.0.reg_info %}{{ day.list.0.reg_info }} - {{ meetingvenue_info.reg_area_name }} <br>{% endif %}
{% ifequal day.list.0.day_id "5" %}
{{ day.list.0.fbreak_info }} - {{ meetingvenue_info.break_area_name }} <br>
diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt
index 341a7a7d3..bd7e366c9 100644
--- a/ietf/templates/meeting/agenda.txt
+++ b/ietf/templates/meeting/agenda.txt
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+{% load humanize %}
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"
-xml:lang="en-US"><head><title>Agenda of the IETF {{ meeting_num }}</title>
+xml:lang="en-US"><head><title>Agenda of the {{ meeting_num|ordinal }} IETF Meeting</title>
</head><body><p>
<pre>
-{% filter center:72 %}Agenda of the IETF {{ meeting_num }} Meeting{% endfilter %}
-{% filter center:72 %}{{ meeting_info.start_date|date:"F j, Y" }} - {{ meeting_info.end_date|date:"F j, Y" }}{% endfilter %}
+{% filter center:72 %}Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endfilter %}
+{% filter center:72 %}{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }}{% endfilter %}
Updated As of : {% now "F j, Y" %}
-{{ meeting_info.start_date|date:"l, F j, Y" }}
+{{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }}
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}
{% for item in qs_sun %}{{ item.sched_time_id1.time_desc }} {{ item.acronym_name }} - {{ item.sched_room_id1.room_name }}
{% endfor %}</pre>