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

[Chris Johnston]

Changes all instances of LoCo Directory to LoCo Team Directory

=== modified file 'TRANSITION.TO.0.2'
--- TRANSITION.TO.0.2	2010-02-16 17:14:13 +0000
+++ TRANSITION.TO.0.2	2010-08-20 13:07:41 +0000
@@ -1,4 +1,4 @@
-For the LoCo Directory 0.2 we made a couple of changes:
+For the LoCo Team Directory 0.2 we made a couple of changes:
 
  - modified schema of existing application (just added a key)
  - "rebased" bazaar branch because of megabytes of stuff that were committed unnecessarily

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2010-08-12 09:59:25 +0000
+++ loco_directory/common/launchpad.py	2010-08-20 13:07:41 +0000
@@ -20,7 +20,7 @@
 
 def lp_login(lp_instance=EDGE_SERVICE_ROOT):
     cachedir = os.path.join(settings.PROJECT_PATH, 'lp_data/cache')
-    client_ident = getattr(settings, 'LP_PROJECT_NAME', "LoCo Directory")
+    client_ident = getattr(settings, 'LP_PROJECT_NAME', "LoCo Team Directory")
     try:
         launchpad = Launchpad.login_anonymously(client_ident, lp_instance, cachedir)
     except:

=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2010-08-03 11:43:25 +0000
+++ loco_directory/common/utils.py	2010-08-20 13:07:41 +0000
@@ -25,7 +25,7 @@
 
 def get_locodirectory_version(version_file, debug):
     """
-    return the bzr revision number and version of the LoCo Directory
+    return the bzr revision number and version of the LoCo Team Directory
     """
 
     if not os.path.exists(version_file):

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-20 09:58:11 +0000
+++ loco_directory/locale/loco-directory.pot	2010-08-20 13:07:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 09:57+0000\n"
+"POT-Creation-Date: 2010-08-20 13:04+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"
@@ -309,6 +309,7 @@
 #: templates/404.html:4 templates/500.html:4 templates/about.html:4
 #: templates/about_loco.html:4 templates/base.html:4
 #: templates/loco_council.html:4 templates/using_locodir.html:4
+#: templates/teams/team_reapprovals.html:4
 msgid "Ubuntu LoCo Team Directory"
 msgstr ""
 
@@ -330,7 +331,8 @@
 
 #: templates/404.html:19 templates/500.html:15
 msgid ""
-"If you believe the reason you are here is a bug in the LoCo Directory please "
+"If you believe the reason you are here is a bug in the LoCo Team Directory "
+"please "
 msgstr ""
 
 #: templates/404.html:19 templates/500.html:15 templates/about.html:31
@@ -371,7 +373,7 @@
 "LoCo Teams. It was originally developed by <a href='https://launchpad.net/"
 "~nixternal'>Richard Johnson</a> and further development has been made "
 "possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo "
-"Directory Developers</a>."
+"Team Directory Developers</a>."
 msgstr ""
 
 #: templates/about.html:13
@@ -517,7 +519,7 @@
 "LoCo project."
 msgstr ""
 
-#: templates/base.html:6
+#: templates/base.html:6 templates/base.html.py:58
 msgid "LoCo Team Directory"
 msgstr ""
 
@@ -566,10 +568,6 @@
 msgid "About the LoCo Team Directory Project"
 msgstr ""
 
-#: templates/base.html:58
-msgid "LoCo Directory"
-msgstr ""
-
 #: templates/index.html:6 templates/using_locodir.html:4
 #: templates/using_locodir.html.py:11
 msgid "Using the LoCo Team Directory"
@@ -1254,7 +1252,8 @@
 msgstr ""
 
 #: templates/teams/team_reapprovals.html:51
-msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
+msgid ""
+"There are currently no approved teams in the Ubuntu LoCo Team Directory. :("
 msgstr ""
 
 #: templates/teams/team_update.html:16

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-08-02 14:43:27 +0000
+++ loco_directory/settings.py	2010-08-20 13:07:41 +0000
@@ -5,7 +5,7 @@
     import ubuntu_website
     uw_import = True
 except ImportError:
-    print "You will need to run  ./manage.py init-ld  to make the LoCo Directory fully work."
+    print "You will need to run  ./manage.py init-ld  to make the LoCo Team Directory fully work."
     uw_import = False
 
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))

=== modified file 'loco_directory/teams/management/commands/init-ld.py'
--- loco_directory/teams/management/commands/init-ld.py	2010-07-28 13:11:58 +0000
+++ loco_directory/teams/management/commands/init-ld.py	2010-08-20 13:07:41 +0000
@@ -10,7 +10,7 @@
 import os
 
 class Command(NoArgsCommand):
-    help = "Make sure the LoCo Directory is set up properly."
+    help = "Make sure the LoCo Team Directory is set up properly."
 
     def handle_noargs(self, **options):
         print " * Compiling messages."

=== modified file 'loco_directory/teams/management/commands/release.py'
--- loco_directory/teams/management/commands/release.py	2010-05-03 10:35:34 +0000
+++ loco_directory/teams/management/commands/release.py	2010-08-20 13:07:41 +0000
@@ -26,7 +26,7 @@
     return (version, bzr_revno)
 
 class Command(LabelCommand):
-    help = "Prepare release of LoCo Directory. Please pass <version> as an argument."
+    help = "Prepare release of LoCo Team Directory. Please pass <version> as an argument."
 
     def handle_label(self, label, **options):
         (version, bzr_revno) = write_version_strings(label)

=== modified file 'loco_directory/templates/404.html'
--- loco_directory/templates/404.html	2010-08-17 00:33:22 +0000
+++ loco_directory/templates/404.html	2010-08-20 13:07:41 +0000
@@ -16,7 +16,7 @@
         <li><a href="{% url venue-list %}">{% trans "You can browse the full list of venues." %}</a></li>
 </ul>
 </p>
-<p>{% trans "If you believe the reason you are here is a bug in the LoCo Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></p>
+<p>{% trans "If you believe the reason you are here is a bug in the LoCo Team Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></p>
 </article>
 
 {% endblock %}

=== modified file 'loco_directory/templates/500.html'
--- loco_directory/templates/500.html	2010-08-17 00:33:22 +0000
+++ loco_directory/templates/500.html	2010-08-20 13:07:41 +0000
@@ -12,7 +12,7 @@
     <h3><a href="{% url team-list %}">{% trans "You can browse the full list of teams" %}</a></h3>
     <p>{% trans "Please make sure the team you are looking for is a member of" %} <a href='https://launchpad.net/~locoteams'>{% trans "The LoCo Teams group in Launchpad" %}</a>
     </p>
-    <p>{% trans "If you believe the reason you are here is a bug in the LoCo Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a>
+    <p>{% trans "If you believe the reason you are here is a bug in the LoCo Team Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a>
     </p>
 </article>
 

=== modified file 'loco_directory/templates/about.html'
--- loco_directory/templates/about.html	2010-08-17 00:33:22 +0000
+++ loco_directory/templates/about.html	2010-08-20 13:07:41 +0000
@@ -10,7 +10,7 @@
 
 <article class="main-content leading">
     <h2>{% trans "What is the LoCo Team Directory?" %}</h2>
-    <p>{% trans "The LoCo Team Directory is a place where you can find information regarding LoCo Teams. It was originally developed by <a href='https://launchpad.net/~nixternal'>Richard Johnson</a> and further development has been made possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo Directory Developers</a>." %} {% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." %}
+    <p>{% trans "The LoCo Team Directory is a place where you can find information regarding LoCo Teams. It was originally developed by <a href='https://launchpad.net/~nixternal'>Richard Johnson</a> and further development has been made possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo Team Directory Developers</a>." %} {% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." %}
     </p>
 </article>
 

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-08-20 09:58:11 +0000
+++ loco_directory/templates/base.html	2010-08-20 13:07:41 +0000
@@ -55,7 +55,7 @@
 <div class="copyright">
 &copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.<br />
 <a href="/about">{% trans "About the LoCo Team Directory Project" %}</a><br />
-{% trans "LoCo Directory" %} {{ loco_version }}
+{% trans "LoCo Team Directory" %} {{ loco_version }}
 </div>
 {% endblock %}
 

=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2010-07-15 14:36:51 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2010-08-20 13:07:41 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Ubuntu LoCo Team Approvals List" %}{% endblock %}
+{% block title %}{% trans "Ubuntu LoCo Team Approvals List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 {% block extrahead %}{{ block.super }}
 <link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
 {% endblock %}
@@ -48,7 +48,7 @@
 
 {% if not next_teams and not later_teams %}
 <article class="main-content">
-<p>{% trans "There are currently no approved teams in the Ubuntu LoCo Directory. :(" %}</p>
+<p>{% trans "There are currently no approved teams in the Ubuntu LoCo Team Directory. :(" %}</p>
 </article>
 {% endif %}