FSFE/fsfe-website
25
31
Fork 92
Code Issues 65 Pull Requests 9 Wiki Activity

Better approach for the "multiple countries" problem.

Browse Source 
svn path=/trunk/; revision=6398
This commit is contained in:
Reinhard Müller
2006-04-13 11:30:41 +00:00
parent 43df850fb7
commit c9b6b8d9d5
2 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
about/people/people.en.xml
View File

@@ -3,150 +3,176 @@
<!-- Do not translate this file -->
<personset>
<person id="beccaria" country="IT">
<person id="beccaria">
<name>Antonella Beccaria</name>
<country>IT</country>
<email>beccaria (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/antonella</link>
</person>
<person id="bowker" country="GB" member="yes">
<person id="bowker" member="yes">
<name>Gareth Bowker</name>
<country>GB</country>
<email>bowker (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/tgb</link>
</person>
<person id="dormeyer" country="DE">
<person id="dormeyer">
<name>Volker Dormeyer</name>
<country>DE</country>
<email>dormeyer (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/volker</link>
</person>
<person id="finkenberger" country="DE">
<person id="finkenberger">
<name>Alexander Finkenberger</name>
<country>DE</country>
<email>finkenberger (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/af</link>
</person>
<person id="gerloff" country="DE">
<person id="gerloff">
<name>Karsten Gerloff</name>
<country>DE</country>
<email>gerloff (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/gerloff</link>
</person>
<person id="gerwinski" country="DE" member="yes" chapter_de="yes">
<person id="gerwinski" member="yes" chapter_de="yes">
<name>Peter Gerwinski</name>
<country>DE</country>
<email>gerwinski (at) fsfeurope (dot) org</email>
</person>
<person id="greve" country="CH" member="yes" chapter_de="yes">
<person id="greve" member="yes" chapter_de="yes">
<name>Georg C. F. Greve</name>
<country>CH</country>
<email>greve (at) fsfeurope (dot) org</email>
<link>/about/greve/greve.html</link>
</person>
<person id="jakob" country="AT" member="yes">
<person id="jakob" member="yes">
<name>Georg Jakob</name>
<country>AT</country>
<email>jakob (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/jack</link>
</person>
<person id="jakobs" country="DE">
<person id="jakobs">
<name>Joachim Jakobs</name>
<country>DE</country>
<email>jakobs (at) fsfeurope (dot) org</email>
<link>/about/jakobs/jakobs.html</link>
</person>
<person id="kersten" country="DE">
<person id="kersten">
<name>Rainer Kersten</name>
<country>DE</country>
<email>kersten (at) fsfeurope (dot) org</email>
</person>
<person id="kirschner" country="DE">
<person id="kirschner">
<name>Matthias Kirschner</name>
<country>DE</country>
<email>kirschner (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/mk</link>
</person>
<person id="koch" country="DE" member="yes" chapter_de="yes">
<person id="koch" member="yes" chapter_de="yes">
<name>Werner Koch</name>
<country>DE</country>
<email>koch (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/werner</link>
</person>
<person id="kosina" country="AT" member="yes">
<person id="kosina" member="yes">
<name>Karin Kosina</name>
<country>AT</country>
<email>kosina (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/kyrah</link>
</person>
<person id="machon" country="ES">
<person id="machon">
<name>Pablo Mach<63>n</name>
<country>ES</country>
<email>machon (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/pablo</link>
</person>
<person id="maffulli" country="IT" member="yes">
<person id="maffulli" member="yes">
<name>Stefano Maffulli</name>
<country>IT</country>
<email>maffulli (at) fsfeurope (dot) org</email>
<link>/about/maffulli/maffulli.html</link>
</person>
<person id="mueller" country="AT" member="yes">
<person id="mueller" member="yes">
<name>Reinhard M<>ller</name>
<country>AT</country>
<email>mueller (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/reinhard</link>
</person>
<person id="oberg" country="SE" member="yes" chapter_de="yes">
<person id="oberg" member="yes" chapter_de="yes">
<name>Jonas <20>berg</name>
<country>SE</country>
<email>oberg (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/jonas</link>
</person>
<person id="ohnewein" country="IT">
<person id="ohnewein">
<name>Patrick Ohnewein</name>
<country>IT</country>
<email>ohnewein (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/patrick</link>
</person>
<person id="oriordan" country="BE,IE">
<person id="oriordan">
<name>Ciar<EFBFBD>n O'Riordan</name>
<country>BE</country>
<country>IE</country>
<email>oriordan (at) fsfeurope (dot) org</email>
<link>/about/oriordan/oriordan.html</link>
</person>
<person id="poderi" country="CH">
<person id="poderi">
<name>Giacomo Poderi</name>
<country>CH</country>
<email>poderi (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/Poderi</link>
</person>
<person id="reina" country="ES">
<person id="reina">
<name>Xavier Reina</name>
<country>ES</country>
<email>reina (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/xreina</link>
</person>
<person id="reiter" country="DE" member="yes" chapter_de="yes">
<person id="reiter" member="yes" chapter_de="yes">
<name>Bernhard Reiter</name>
<country>DE</country>
<email>reiter (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/bernhard</link>
</person>
<person id="rigamonti" country="IT">
<person id="rigamonti">
<name>Cristian Rigamonti</name>
<country>IT</country>
<email>rigamonti (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/cri</link>
</person>
<person id="rubini" country="IT">
<person id="rubini">
<name>Alessandro Rubini</name>
<country>IT</country>
<country>Italy</country>
<email>rubini (at) fsfeurope (dot) org</email>
</person>
<person id="sandklef" country="SE" member="yes">
<person id="sandklef" member="yes">
<name>Henrik Sandklef</name>
<country>SE</country>
<email>sandklef (at) fsfeurope (dot) org</email>
<link>http://www.fsfe.org/en/fellows/hesa</link>
</person>

4
contact/contact.xsl
View File

@@ -53,10 +53,10 @@
<!-- Core team members -->
<xsl:element name="p">
<xsl:choose>
<xsl:when test="count(/html/set/person[contains(@country,$country)])>0">
<xsl:when test="count(/html/set/person[count(country[text()=$country])>0])>0">
<xsl:value-of select="/html/text[@id='members']" />
<xsl:text> </xsl:text>
<xsl:for-each select="/html/set/person[contains(@country,$country)]">
<xsl:for-each select="/html/set/person[count(country[text()=$country])>0]">
<xsl:if test="position()!=1">
<xsl:text>, </xsl:text>
</xsl:if>