From 31072e0f513568a9179a408bf15c32b644a3604a Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Thu, 30 Apr 2020 13:45:35 +0200
Subject: [PATCH] use care team data from people.en.xml

this make us lose the GPG + language info, but with big advantages
---
 about/codeofconduct-careteam.en.xml           |  87 ------------------
 about/codeofconduct.xsl                       |   5 +-
 .../avatars/falgueyrac.jpg}                   | Bin
 about/people/people.en.xml                    |   7 ++
 4 files changed, 11 insertions(+), 88 deletions(-)
 delete mode 100644 about/codeofconduct-careteam.en.xml
 rename about/{falgueyrac/lucile-falgueyrac-avatar.jpg => people/avatars/falgueyrac.jpg} (100%)

diff --git a/about/codeofconduct-careteam.en.xml b/about/codeofconduct-careteam.en.xml
deleted file mode 100644
index c49b8e32a4..0000000000
--- a/about/codeofconduct-careteam.en.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- Please do not translate this file, it's static for all language versions -->
-<ul class="people">
-  <version>1</version>
-
-
-  <li>
-    <p>
-      <a href="/about/albers/albers">
-        <img alt="Erik Albers" src="/about/albers/albers-avatar.jpg" />
-      </a>
-      <span class="name"><a href="/about/albers/albers">Erik
-Albers</a></span>
-      <span class="email"><a href="mailto:eal@fsfe.org">eal (at) fsfe (dot) org</a> (<a
-href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=eal%40fsfe.org">PGP</a>)</span>
-      <span class="languages">Speaks: English, German, Spanish</span>
-      <span class="additional-information"><em>Full-time employee of FSFE</em></span>
-    </p>
-  </li>
-  
-  
-    <li>
-    <p>
-      <img alt="Lucile Falgueyrac"
-src="/about/falgueyrac/lucile-falgueyrac-avatar.jpg" />
-      <span class="name">Lucile Falgueyrac</span>
-      <span class="email"><a href="mailto:lucile.falg@fsfe.org">lucile.falg (at) fsfe (dot) org</a> (<a
-href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x83E1D9A12C7FF2D5">PGP</a>)</span>
-      <span class="languages">Speaks: English, French, German</span>
-    </p>
-  </li>
-
-
-  <li>
-    <p>
-      <img alt="Polina Malaja" src="/about/malaja/malaja-avatar.jpg" />
-      <span class="name">Polina Malaja</span>
-      <span class="email"><a href="mailto:polina@fsfe.org">polina (at) fsfe
-(dot) org</a> (<a
-href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=polina%40fsfe.org">PGP</a>)</span>
-      <span class="languages">Speaks: English, Estonian, Russian</span>
-    </p>
-  </li>  
-
-  <li>
-    <p>
-      <img alt="Jan-Christoph Borchardt"
-src="/about/borchardt/borchardt-avatar.jpg" />
-      <span class="name">Jan-Christoph Borchardt</span>
-      <span class="email"><a href="mailto:jancborchardt@fsfe.org">jancborchardt (at) fsfe (dot) org</a>  (<a
-href="https://keybase.io/jancborchardt/pgp_keys.asc?fingerprint=ecd0c4a3a2fc72b354e4fc78cbd846fc845cbe17">PGP</a>)</span>
-      <span class="languages">Speaks: English, German</span>
-    </p>
-  </li>
-
-
-<li>
-    <p>
-      <a href="/about/ku/ku">
-        <img alt="Gabriel Ku Wei Bin" src="/about/ku/ku-avatar.jpg" />
-      </a>
-      <span class="name"><a href="/about/ku/ku">Gabriel Ku Wei Bin</a></span>
-      <span class="email"><a href="mailto:gabriel.ku@fsfe.org">gabiel.ku (at) fsfe (dot) org</a> (<a
-href="https://hkps.pool.sks-keyservers.net/pks/lookup?search=gabriel.ku%40fsfe.org">PGP</a>)</span>
-      <span class="languages">Speaks: English, German, Mandarin</span>
-      <span class="additional-information"><em>Full-time employee of FSFE</em></span>
-    </p>
-  </li>
-
-
-  <li>
-    <p>
-      <a href="/about/repentinus/repentinus">
-       <img alt="Heiki Lõhmus" src="/about/repentinus/avatar.jpg" />
-      </a>
-      <span class="name"><a href="/about/repentinus/repentinus">Heiki
-Lõhmus</a></span>
-      <span class="email"><a href="mailto:repentinus@fsfe.org">repentinus (at)
-fsfe (dot) org</a> (<a
-href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=repentinus%40fsfe.org">PGP</a>)</span>
-      <span class="languages">Speaks: English, Estonian</span>
-      <span class="additional-information"><em>Vice-President of FSFE</em></span>
-    </p>
-  </li>
-
-  
-
-</ul>
diff --git a/about/codeofconduct.xsl b/about/codeofconduct.xsl
index ecab773825..baa10874f1 100644
--- a/about/codeofconduct.xsl
+++ b/about/codeofconduct.xsl
@@ -4,7 +4,10 @@
   <xsl:import href="../fsfe.xsl" />
   <xsl:import href="../build/xslt/people.xsl" />
 
+  <!-- All people with council tag -->
   <xsl:template match="care-team-list">
-    <xsl:copy-of select="document('codeofconduct-careteam.en.xml')"/>
+    <xsl:call-template name="country-people-list">
+      <xsl:with-param name="team" select="'care'" />
+    </xsl:call-template>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/about/falgueyrac/lucile-falgueyrac-avatar.jpg b/about/people/avatars/falgueyrac.jpg
similarity index 100%
rename from about/falgueyrac/lucile-falgueyrac-avatar.jpg
rename to about/people/avatars/falgueyrac.jpg
diff --git a/about/people/people.en.xml b/about/people/people.en.xml
index e95aa29302..dca6b397b5 100644
--- a/about/people/people.en.xml
+++ b/about/people/people.en.xml
@@ -278,6 +278,13 @@
     <email>nicola (dot) feltrin (at) fsfe (dot) org</email>
   </person>
 
+  <person id="falgueyrac">
+    <name>Lucile Falgueyrac</name>
+    <team>care</team>
+    <email>lucile.falg (at) fsfe (dot) org</email>
+    <avatar>falgueyrac.jpg</avatar>
+  </person>
+
   <person id="gerloff">
     <name>Karsten Gerloff</name>
     <country>DE</country>