Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/644817 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #644817 Global Event Page should list the team name and the event name https://bugs.launchpad.net/bugs/644817 -- https://code.launchpad.net/~chrisjohnston/loco-directory/644817/+merge/40711 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/644817 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-10-21 16:35:47 +0000 +++ loco_directory/locale/loco-directory.pot 2010-11-12 12:02:53 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 16:35+0000\n" +"POT-Creation-Date: 2010-11-12 01:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -1009,6 +1009,13 @@ msgid "More Information about Team Event" msgstr "" +#: templates/events/global_event_detail_attending_teamevents.inc.html:10 +#: templates/events/global_event_detail_attending_teamevents.inc.html:25 +#: templates/events/global_event_detail_attending_teamevents.inc.html:38 +#: templates/events/team_event_list.inc.html:16 +msgid "more information about this team" +msgstr "" + #: templates/events/global_event_detail_attending_teamevents.inc.html:19 msgid "Events in countries without continents" msgstr "" @@ -1197,10 +1204,6 @@ msgid "Global Event" msgstr "" -#: templates/events/team_event_list.inc.html:16 -msgid "more information about this team" -msgstr "" - #: templates/events/team_event_new.html:4 #: templates/events/team_event_new_select.html:4 msgid "New Team Event" === modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html' --- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-23 13:17:10 +0000 +++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-11-12 12:02:53 +0000 @@ -7,7 +7,7 @@ <ul> {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}"> - <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %} </li> {% endifequal %}{% endfor %} </ul> @@ -22,7 +22,7 @@ <ul> {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}</li>"> - <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %} </li> {% endifequal %}{% endfor %} </ul> @@ -35,7 +35,7 @@ <ul> {% for team_event in events_without_venue %} <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}"> - <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %} </li> {% endfor %} </ul>
_______________________________________________ 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
