Bug#709617: www.debian.org: update list of delegates in organization.html
On 24/05/13 at 13:53 -0400, "David Prévot" wrote:
> Hi,
>
> > On 24/05/13 at 11:44 -0400, David Prévot wrote:
> >> Le 24/05/2013 08:57, Lucas Nussbaum a écrit :
>
> >>> - add (delegate) next to names of delegates.
> >>
> >> This must allow a feminine form, for some translations. Such a trick
> >> already exists, probably in the DPN handling.
> >
> > Do you have a more precise pointer?
>
> Sure: english/template/debian/weeklynews/footer.wml
Thanks. New version of the patch attached. I went for something simpler
than in the weeklynews template, but that should work.
Lucas
Index: organization.data
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/organization.data,v
retrieving revision 1.461
diff -u -r1.461 organization.data
--- organization.data 23 May 2013 19:44:06 -0000 1.461
+++ organization.data 24 May 2013 18:40:01 -0000
@@ -11,6 +11,9 @@
<define-tag job><li>%attributes —</define-tag>
<define-tag genericemail><<a href="mailto:%0";>%0</a>></define-tag>
<define-tag delegationmail>— <a href="http://lists.debian.org/%0";><gettext domain="organization">delegation mail</gettext></a></define-tag>
+<define-tag appointmentmail>— <a href="http://lists.debian.org/%0";><gettext domain="organization">appointment mail</gettext></a></define-tag>
+<define-tag delegate_male> (<gettext domain="organization"><void id="male"/>delegate</gettext>)</define-tag>
+<define-tag delegate_female> (<gettext domain="organization"><void id="female"/>delegate</gettext>)</define-tag>
# current* is only for positions necessarily transitional, such as the leader
<define-tag current><br>
<spaces><em><gettext domain="organization">current</gettext></em> </define-tag>
@@ -65,7 +68,7 @@
<member>Ian Jackson
<member>Steve Langasek
<member>Colin Watson
- <job <a href="$(HOME)/devel/secretary"><gettext domain="organization">Secretary</gettext></a>> <genericemail secretary@debian.org> <delegationmail 20130208193756.GA30999@upsilon.cc>
+ <job <a href="$(HOME)/devel/secretary"><gettext domain="organization">Secretary</gettext></a>> <genericemail secretary@debian.org> <appointmentmail 20130208193756.GA30999@upsilon.cc>
<current>Kurt Roeckx
<assistant>Neil McGovern
</ul>
@@ -78,9 +81,9 @@
<job <a href="http://ftp-master.debian.org/";><gettext domain="organization">FTP Archives</gettext></a>> <genericemail ftpmaster@debian.org> <delegationmail 20121017091648.GA32215@upsilon.cc>
<ul>
<job <gettext domain="organization">FTP Masters</gettext>>
- <member>Ansgar Burchardt
- <member>Joerg Jaspert
- <member>Mark Hymers
+ <member>Ansgar Burchardt <delegate_male>
+ <member>Joerg Jaspert <delegate_male>
+ <member>Mark Hymers <delegate_male>
<job <gettext domain="organization">FTP Assistants</gettext>>
<member>Mike O'Connor
<member>Alexander Reichle-Schmehl
@@ -91,8 +94,8 @@
<job <a href="http://backports-master.debian.org/";><gettext domain="organization">Backports</gettext></a>> <genericemail team@backports.debian.org> <delegationmail 20110706145100.GA13459@upsilon.cc>
<ul>
<job <gettext domain="organization">Backports Team</gettext>>
- <member>Alexander Wirt
- <member>Gerfried Fuchs
+ <member>Alexander Wirt<delegate_male>
+ <member>Gerfried Fuchs<delegate_female>
</ul>
<job <a href="$(HOME)/devel/people"><gettext domain="organization">Individual Packages</gettext></a>> <var><packagename></var>@packages.debian.org
<job <a href="http://release.debian.org/";><gettext domain="organization">Release Management</gettext></a>> <genericemail debian-release@lists.debian.org>
@@ -215,9 +218,9 @@
<ul>
<job <gettext domain="organization">Press Contact</gettext>> <genericemail press@debian.org> <delegationmail 20120321153254.GA6731@upsilon.cc>
- <member>Francesca Ciceri
- <member>Martin Schulze
- <member>Neil McGovern
+ <member>Francesca Ciceri<delegate_female>
+ <member>Martin Schulze<delegate_male>
+ <member>Neil McGovern<delegate_male>
<assistant>Paul Wise
<assistant>Moray Allan
<assistant>Kai Wasserbäch
@@ -238,8 +241,8 @@
<member>Marcelo Santana
<member>Martin Schulze
<job <a href="http://bits.debian.org/";><gettext domain="organization">Bits from Debian</gettext></a>> <genericemail debian-publicity@lists.debian.org> <delegationmail 20130520093925.GB5529@xanadu.blop.info>
- <member>Francesca Ciceri
- <member>Ana Beatriz Guerrero López
+ <member>Francesca Ciceri<delegate_female>
+ <member>Ana Beatriz Guerrero López<delegate_female>
</ul>
<a name="support"></a>
@@ -327,17 +330,21 @@
<current>Martin Zobel-Helas
<current>Pascal Hakim
<job <a href="$(HOME)/devel/join/newmaint#FrontDesk"><gettext domain="organization">New Members Front Desk</gettext></a>> <genericemail nm@debian.org> <delegationmail 20121017091656.GB32215@upsilon.cc>
- <member>Bernd Zeimetz
- <member>Enrico Zini
- <member>Jan Hauke Rahm
- <member>Jonathan Wiltshire
+ <member>Bernd Zeimetz<delegate_male>
+ <member>Enrico Zini<delegate_male>
+ <member>Jan Hauke Rahm<delegate_male>
+ <member>Jonathan Wiltshire<delegate_male>
<job <a href="$(HOME)/devel/join/newmaint#DAM"><gettext domain="organization">Debian Account Managers</gettext></a>> <genericemail da-manager@debian.org> <delegationmail 20101019212322.GA6581@upsilon.cc>
- <member>Joerg Jaspert
- <member>Christoph Berg
- <member>Enrico Zini
- <job <a href="http://keyring.debian.org/";><gettext domain="organization">Keyring Maintainers (PGP and GPG)</gettext></a>> <genericemail keyring-maint@debian.org>
- <member>Jonathan McDowell
+ <member>Joerg Jaspert<delegate_male>
+ <member>Christoph Berg<delegate_male>
+ <member>Enrico Zini<delegate_male>
+ <job <a href="http://keyring.debian.org/";><gettext domain="organization">Keyring Maintainers (PGP and GPG)</gettext></a>> <genericemail keyring-maint@debian.org> <delegationmail 20080515012327.GI23247@einval.com>
+ <member>Jonathan McDowell<delegate_male>
<member>Gunnar Wolf
+ <job <a href="http://wiki.debian.org/DebianMaintainer";><gettext domain="organization">Debian Maintainer (DM) Keyring Maintainers</gettext></a>> <genericemail debian-newmaint@lists.debian.org> <delegationmail 20071118163748.GA13768@zoy.org>
+ <member>Anibal Monsalve Salazar<delegate_male>
+ <member>Anthony Towns<delegate_male>
+ <member>Joey Hess<delegate_male>
<job <a href="$(HOME)/security/"><gettext domain="organization">Security Team</gettext></a>> <genericemail team@security.debian.org>
<member>Aurelien Jarno
<member>Dann Frazier
@@ -390,18 +397,18 @@
<member>Joerg Jaspert
<member>Jordi Mallach
<job <a href="$(DOC)/debian-policy/"><gettext domain="organization">Policy</gettext></a>> <genericemail debian-policy@lists.debian.org> <delegationmail 20121017195148.GA26024@upsilon.cc>
- <member>Andreas Barth
- <member>Bill Allombert
- <member>Charles Plessy
- <member>Russ Allbery
+ <member>Andreas Barth<delegate_male>
+ <member>Bill Allombert<delegate_male>
+ <member>Charles Plessy<delegate_male>
+ <member>Russ Allbery<delegate_male>
<job <a href="http://dsa.debian.org/";><gettext domain="organization">System Administration</gettext></a>> <genericemail debian-admin@lists.debian.org> <delegationmail 20111017111338.GA5197@upsilon.cc>
<note <gettext domain="organization">This is the address to use when encountering problems on one of Debian's machines, including password problems or you need a package installed.</gettext>>
- <member>Luca Filipozzi
- <member>Tollef Fog Heen
- <member>Stephen Gran
- <member>Faidon Liambotis
- <member>Peter Palfrader
- <member>Martin Zobel-Helas
+ <member>Luca Filipozzi<delegate_male>
+ <member>Tollef Fog Heen<delegate_male>
+ <member>Stephen Gran<delegate_male>
+ <member>Faidon Liambotis<delegate_male>
+ <member>Peter Palfrader<delegate_male>
+ <member>Martin Zobel-Helas<delegate_male>
<note <gettext domain="organization">If you have hardware problems with Debian machines, please see <a href="http://db.debian.org/machines.cgi";>Debian Machines</a> page, it should contain per-machine administrator information.</gettext>>
<job <a href="http://db.debian.org/";><gettext domain="organization">LDAP Developer Directory Administrator</gettext></a>> <genericemail admin@db.debian.org>
<job <a href="$(HOME)/mirror/"><gettext domain="organization">Mirrors</gettext></a>> <genericemail mirrors@debian.org>
@@ -418,7 +425,7 @@
<member>Benjamin Mako Hill
<member>Rob Bradford
<job <a href="http://wiki.debian.org/Teams/Auditor";><gettext domain="organization">Auditor</gettext></a>> <genericemail auditor@debian.org> <delegationmail 20101009140120.GA26192@upsilon.cc>
- <member>Martin Michlmayr
+ <member>Martin Michlmayr<delegate_male>
<member>Martin Wuertele
<job <gettext domain="organization"><a href="m4_HOME/trademark">Trademark</a> use requests</gettext>> <genericemail trademark@debian.org>
<member><em><gettext domain="organization">current Debian Project Leader</gettext></em>
@@ -437,9 +444,12 @@
<member>Margarita Manterola
<member>Meike Reichle
<job <a href="http://www.debconf.org/";><gettext domain="organization">DebConf chairs</gettext></a>> <genericemail debconf-chairs@debian.org> <delegationmail 20110309091510.GA22436@upsilon.cc>
- <member>Holger Levsen
- <member>Moray Allan
- <member>Gunnar Wolf
+ <member>Holger Levsen<delegate_male>
+ <member>Moray Allan<delegate_male>
+ <member>Gunnar Wolf<delegate_male>
+ <job <a href="http://wiki.debian.org/SummerOfCode2013";><gettext domain="organization">Summer of Code 2013 Administrators</gettext></a>> <genericemail soc-coordination@lists.alioth.debian.org> <delegationmail 20130218080807.GD3877@upsilon.cc>
+ <member>David Bremner<delegate_male>
+ <member>Paul Tagliamonte<delegate_male>
</ul>
Reply to: