LoCo Team Portal

Merge lp:~dholbach/loco-team-portal/570617 into lp:loco-team-portal

  1. 570617
  2. Merge into 0.2
Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/loco-team-portal/570617
Merge into: lp:loco-team-portal
Diff against target: 133 lines (+30/-17)
2 files modified
loco_directory/locale/loco-directory.pot (+24/-16)
loco_directory/templates/teams/team_detail.html (+6/-1)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/570617
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+24302@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

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-04-28 09:35:30 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-04-28 10:16:21 +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-04-28 09:34+0000\n"
9+"POT-Creation-Date: 2010-04-28 10:11+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@@ -226,11 +226,11 @@
14 msgid "Forums URL"
15 msgstr ""
16
17-#: teams/models.py:22 templates/teams/team_detail.html:84
18+#: teams/models.py:22 templates/teams/team_detail.html:89
19 msgid "Email Address"
20 msgstr ""
21
22-#: teams/models.py:23 templates/teams/team_detail.html:78
23+#: teams/models.py:23 templates/teams/team_detail.html:83
24 msgid "IRC Channel"
25 msgstr ""
26
27@@ -828,60 +828,68 @@
28 msgid "Location:"
29 msgstr ""
30
31-#: templates/teams/team_detail.html:42 templates/teams/team_detail.html:105
32+#: templates/teams/team_detail.html:42 templates/teams/team_detail.html:110
33 msgid "None Specified"
34 msgstr ""
35
36 #: templates/teams/team_detail.html:47
37+msgid "Launchpad Page:"
38+msgstr ""
39+
40+#: templates/teams/team_detail.html:48
41+msgid "Join this team!"
42+msgstr ""
43+
44+#: templates/teams/team_detail.html:52
45 msgid "Launchpad Team Owner:"
46 msgstr ""
47
48-#: templates/teams/team_detail.html:53
49+#: templates/teams/team_detail.html:58
50 msgid "Approval Date:"
51 msgstr ""
52
53-#: templates/teams/team_detail.html:59
54+#: templates/teams/team_detail.html:64
55 msgid "Expires Date:"
56 msgstr ""
57
58-#: templates/teams/team_detail.html:65
59+#: templates/teams/team_detail.html:70
60 msgid "Launchpad Team Admin(s):"
61 msgstr ""
62
63-#: templates/teams/team_detail.html:72
64+#: templates/teams/team_detail.html:77
65 msgid "Resources:"
66 msgstr ""
67
68-#: templates/teams/team_detail.html:75
69+#: templates/teams/team_detail.html:80
70 msgid "Team Wiki"
71 msgstr ""
72
73-#: templates/teams/team_detail.html:81
74+#: templates/teams/team_detail.html:86
75 msgid "Team Mailing List"
76 msgstr ""
77
78-#: templates/teams/team_detail.html:87
79+#: templates/teams/team_detail.html:92
80 msgid "Team Forums"
81 msgstr ""
82
83-#: templates/teams/team_detail.html:90
84+#: templates/teams/team_detail.html:95
85 msgid "Team Website"
86 msgstr ""
87
88-#: templates/teams/team_detail.html:93
89+#: templates/teams/team_detail.html:98
90 msgid "Provides Support"
91 msgstr ""
92
93-#: templates/teams/team_detail.html:99
94+#: templates/teams/team_detail.html:104
95 msgid "Upcoming Events:"
96 msgstr ""
97
98-#: templates/teams/team_detail.html:103
99+#: templates/teams/team_detail.html:108
100 #, python-format
101 msgid "%(start_date)s in %(city)s"
102 msgstr ""
103
104-#: templates/teams/team_detail.html:104
105+#: templates/teams/team_detail.html:109
106 msgid "Show detailed Event List"
107 msgstr ""
108
109
110=== modified file 'loco_directory/templates/teams/team_detail.html'
111--- loco_directory/templates/teams/team_detail.html 2010-04-21 12:36:54 +0000
112+++ loco_directory/templates/teams/team_detail.html 2010-04-28 10:16:21 +0000
113@@ -31,7 +31,7 @@
114 <table id="team-content">
115 <tr>
116 <td rowspan="30" class="locobranding"><img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}"/></td>
117- <td colspan="2"><h2><a href="https://launchpad.net/~{{ team.lp_name }}">{% trans team.name %}</a></h2></td>
118+ <td colspan="2"><h2>{{ team.name }}</a></h2></td>
119 </tr>
120
121 <tr>
122@@ -43,6 +43,11 @@
123 {% endif %}</td>
124 </tr>
125
126+ <tr>
127+ <th scope="row"><label>{% trans "Launchpad Page:" %}</label></th>
128+ <td><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a> (<a href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join this team!" %}</a>)</td>
129+ </tr>
130+
131 <tr>
132 <th scope="row"><label>{% trans "Launchpad Team Owner:" %}</label></th>
133 <td><a href="https://launchpad.net/~{{ team.owner }}">{{ team.owner }}</a></td>

Subscribers

People subscribed via source and target branches