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 %}
- Agenda of the {{ meeting_num }}th IETF Meeting
- {{ meeting_info.start_date|date:"F j, Y" }} - {{ meeting_info.end_date|date:"F j, Y" }}
-Updated As of : {% now "F j, Y" %}
+ Agenda of the {{ meeting_num|ordinal }} IETF Meeting
+{{ 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" }}
+Updated As of {% now "F j, Y" %}
Text Format of the Agenda
@@ -14,7 +15,7 @@ Updated As of : {% now "F j, Y" %}
*** Click on an acronym of the group to get a charter page ***
*** Click on a name of the group to get a meeting agenda ***

-

{{ 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 %} @@ -23,7 +24,7 @@ Updated As of : {% now "F j, Y" %}

{% regroup object_list by day_id as days %} {% for day in days %} - {{ day.list.0.meeting_date|date:"l, F j, Y" }}
+ {{ day.list.0.meeting_date|date:"l"|upper }}, {{ day.list.0.meeting_date|date:"F j, Y" }}
{% if day.list.0.reg_info %}{{ day.list.0.reg_info }} - {{ meetingvenue_info.reg_area_name }}
{% endif %} {% ifequal day.list.0.day_id "5" %} {{ day.list.0.fbreak_info }} - {{ meetingvenue_info.break_area_name }}
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 @@ +{% load humanize %} Agenda of the IETF {{ meeting_num }} +xml:lang="en-US">Agenda of the {{ meeting_num|ordinal }} IETF Meeting 

-{% 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 %}