Merge lp:~cjohnston/loco-team-portal/bug-637232 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 291
Merged at revision: 291
Proposed branch: lp:~cjohnston/loco-team-portal/bug-637232
Merge into: lp:loco-team-portal
Diff against target: 34 lines (+3/-3)
2 files modified
loco_directory/locale/loco-directory.pot (+2/-2)
loco_directory/teams/models.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bug-637232
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+35307@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/locale/loco-directory.pot'
2--- loco_directory/locale/loco-directory.pot 2010-09-11 20:07:35 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-09-13 17:11:46 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-09-11 20:06+0000\n"
9+"POT-Creation-Date: 2010-09-13 17:08+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -287,7 +287,7 @@
14 msgstr ""
15
16 #: teams/models.py:86
17-msgid "URL of mugshot"
18+msgid "Team Logo"
19 msgstr ""
20
21 #: teams/models.py:88
22
23=== modified file 'loco_directory/teams/models.py'
24--- loco_directory/teams/models.py 2010-09-02 13:34:30 +0000
25+++ loco_directory/teams/models.py 2010-09-13 17:11:46 +0000
26@@ -83,7 +83,7 @@
27 owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
28 admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
29 contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
30- mugshot_url = models.URLField(_("URL of mugshot"), verify_exists=False, null=True, blank=True)
31+ mugshot_url = models.URLField(_("Team Logo"), verify_exists=False, null=True, blank=True)
32 languages = models.ManyToManyField(Language)
33 flickr_id = models.CharField(_("Flickr User ID"), max_length=20, null=True, blank=True,
34 help_text=_("To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"))

Subscribers

People subscribed via source and target branches