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

Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/loco-team-portal/539903
Merge into: lp:loco-team-portal
Diff against target: 52 lines (+5/-5)
2 files modified
loco_directory/locale/loco-directory.pot (+3/-3)
loco_directory/templates/teams/team_detail.html (+2/-2)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/539903
Reviewer Review Type Date Requested Status
Michael Hall Pending
Review via email: mp+23023@code.launchpad.net

This proposal supersedes a proposal from 2010-04-08.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot 2010-04-08 11:38:36 +0000
+++ loco_directory/locale/loco-directory.pot 2010-04-08 13:58:18 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2010-04-08 11:35+0000\n"11"POT-Creation-Date: 2010-04-08 13:55+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -817,7 +817,7 @@
817msgstr ""817msgstr ""
818818
819#: templates/teams/team_detail.html:47819#: templates/teams/team_detail.html:47
820msgid "Team Leader:"820msgid "Launchpad Team Owner:"
821msgstr ""821msgstr ""
822822
823#: templates/teams/team_detail.html:53823#: templates/teams/team_detail.html:53
@@ -829,7 +829,7 @@
829msgstr ""829msgstr ""
830830
831#: templates/teams/team_detail.html:65831#: templates/teams/team_detail.html:65
832msgid "Admins:"832msgid "Launchpad Team Admin(s):"
833msgstr ""833msgstr ""
834834
835#: templates/teams/team_detail.html:72835#: templates/teams/team_detail.html:72
836836
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-03-16 21:46:16 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-04-08 13:58:18 +0000
@@ -44,7 +44,7 @@
44 </tr>44 </tr>
4545
46 <tr>46 <tr>
47 <th scope="row"><label>{% trans "Team Leader:" %}</label></th>47 <th scope="row"><label>{% trans "Launchpad Team Owner:" %}</label></th>
48 <td><a href="https://launchpad.net/~{{ team.owner }}">{{ team.owner }}</a></td>48 <td><a href="https://launchpad.net/~{{ team.owner }}">{{ team.owner }}</a></td>
49 </tr>49 </tr>
50 50
@@ -62,7 +62,7 @@
62 {% endif %}62 {% endif %}
6363
64 <tr>64 <tr>
65 <th scope="row"><label>{% trans "Admins:" %}</label></th>65 <th scope="row"><label>{% trans "Launchpad Team Admin(s):" %}</label></th>
66 <td>{% for admin in team.admins.all %}66 <td>{% for admin in team.admins.all %}
67 <a href="https://launchpad.net/~{{ admin.lpid }}">{{ admin.lpid }}</a>{% if not forloop.last %},{% endif %}67 <a href="https://launchpad.net/~{{ admin.lpid }}">{{ admin.lpid }}</a>{% if not forloop.last %},{% endif %}
68 {% endfor %}</td>68 {% endfor %}</td>

Subscribers

People subscribed via source and target branches