Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/705265
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#705265 LoCo events page has wrong date, or needs timezone
https://bugs.launchpad.net/bugs/705265
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/705265/+merge/46921
--
https://code.launchpad.net/~chrisjohnston/loco-directory/705265/+merge/46921
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/705265 into lp:loco-directory.
=== modified file 'loco_directory/templates/events/team_event_detail_basic.inc.html'
--- loco_directory/templates/events/team_event_detail_basic.inc.html 2010-11-19 13:39:53 +0000
+++ loco_directory/templates/events/team_event_detail_basic.inc.html 2011-01-20 14:52:41 +0000
@@ -6,9 +6,9 @@
<th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th>
<td class="form-item-value">
{% ifequal team_event_object.local_date_begin|date team_event_object.local_date_end|date %}
- {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T (O)" }}
+ {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T" }}
{% else %}
- {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T (O)" }}
+ {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T" }}
{% endifequal %}
</td>
</tr>
=== modified file 'loco_directory/templates/events/team_event_li.inc.html'
--- loco_directory/templates/events/team_event_li.inc.html 2011-01-10 16:09:19 +0000
+++ loco_directory/templates/events/team_event_li.inc.html 2011-01-20 14:52:41 +0000
@@ -1,5 +1,5 @@
{% load i18n %}
{% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
<li>
- <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
+ <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
</li>
=== modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
--- loco_directory/templates/meetings/team_meeting_li.inc.html 2011-01-10 16:09:19 +0000
+++ loco_directory/templates/meetings/team_meeting_li.inc.html 2011-01-20 14:52:41 +0000
@@ -1,5 +1,5 @@
{% load i18n %}
{% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
<li>
- <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
+ <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
</li>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
