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

[Chris Johnston]

Changed lp_name to team.name on team event history

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-20 16:29:46 +0000
+++ loco_directory/locale/loco-directory.pot	2010-08-21 21:33:46 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 16:29+0000\n"
+"POT-Creation-Date: 2010-08-21 21:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'loco_directory/templates/teams/team_event_history.html'
--- loco_directory/templates/teams/team_event_history.html	2010-08-17 00:25:27 +0000
+++ loco_directory/templates/teams/team_event_history.html	2010-08-21 21:33:46 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
@@ -12,7 +12,7 @@
 
 {% block content %}
 <article class="main-content">
-<h1>{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}</h1>
+<h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}</h1>
 
 {% if team_event_list %}
 <p>{% trans "Select a team event below to see more information about it:" %}</p>