Merge lp:~cjohnston/loco-team-portal/bugfix-lp-542591 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-542591
Merge into: lp:loco-team-portal
Diff against target: 25 lines (+2/-2)
2 files modified
loco_directory/templates/events/global_event_list.inc.html (+1/-1)
loco_directory/templates/events/team_event_list.inc.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-542591
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+21773@code.launchpad.net

Description of the change

Changes starts at: to starts on:

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Should "starts on:" be "starts on: "?

85. By Chris Johnston

Fixes spacing issue

Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work. I also updated the .pot file.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/global_event_list.inc.html'
2--- loco_directory/templates/events/global_event_list.inc.html 2010-03-16 23:50:39 +0000
3+++ loco_directory/templates/events/global_event_list.inc.html 2010-03-23 11:18:26 +0000
4@@ -4,7 +4,7 @@
5 <td width="100%" valign="top" class="col2_container">
6 <ul>
7 {% for global_event in global_event_list %}
8-<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts at: " %}{{ global_event.date_begin|date}} ({{global_event.teamevent_set.all.count}} {% trans "team events attend." %})</li>
9+<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts on: " %}{{ global_event.date_begin|date}} ({{global_event.teamevent_set.all.count}} {% trans "team events attend." %})</li>
10 {% endfor %}
11 </ul>
12 </td>
13
14=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
15--- loco_directory/templates/events/team_event_list.inc.html 2010-01-10 12:33:48 +0000
16+++ loco_directory/templates/events/team_event_list.inc.html 2010-03-23 11:18:26 +0000
17@@ -4,7 +4,7 @@
18 <td width="100%" valign="top" class="col2_container">
19 <ul>
20 {% for team_event in team_event_list %}
21-<li class="{% cycle 'col_left' 'col_right'%}"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> {% trans "starts at:" %}{{ team_event.date_begin|date}} ({% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{team.lp_name}}</a>{% if not forloop.last %},{% endif %}{% endfor %})</li>
22+<li class="{% cycle 'col_left' 'col_right'%}"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> {% trans "starts on: " %}{{ team_event.date_begin|date}} ({% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{team.lp_name}}</a>{% if not forloop.last %},{% endif %}{% endfor %})</li>
23 {% endfor %}
24 </ul>
25 </td>

Subscribers

People subscribed via source and target branches