bugfix: do not add nested <body> structure by accident

svn path=/trunk/; revision=33408
2016-05-28 10:53:41 +00:00 · 2016-05-28 10:53:41 +00:00 · 7c1247a32b
parent 50dcd9d6e5
commit 7c1247a32b
--- a/build/xslt/fsfe_mainsection.xsl
+++ b/build/xslt/fsfe_mainsection.xsl
@ -14,7 +14,7 @@
        </xsl:if>
  
        <!-- Here goes the actual content of the <body> node of the input file -->
-        <xsl:apply-templates select="body | /buildinfo/document/event/body | /buildinfo/document/news/body" />
+        <xsl:apply-templates select="/buildinfo/document/event/body | /buildinfo/document/news/body | /buildinfo/document/body/*" />
      
        <!-- Show tags if this is a news press release or an event -->
        <xsl:if test="/buildinfo/document/@newsdate or /buildinfo/document/event">
--- a/campaigns/pdfreaders/petition.ar.xhtml
+++ b/campaigns/pdfreaders/petition.ar.xhtml
@ -77,6 +77,7 @@
 	<h2>قائمة الموقعين</h2>
 	

+    <include-signatures/>
  </body>
  <translator>أسامة خالد</translator>
  <timestamp>$Date: 2010-09-07 16:38:57 +0200 (Tue, 07 Sep 2010) $ $Author: maelle $</timestamp>
--- a/campaigns/pdfreaders/petition.cs.xhtml
+++ b/campaigns/pdfreaders/petition.cs.xhtml
@ -87,6 +87,7 @@
 	
 	<h2>Seznam signatářů</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Podniky</text>
--- a/campaigns/pdfreaders/petition.cz.xhtml
+++ b/campaigns/pdfreaders/petition.cz.xhtml
@ -86,6 +86,7 @@
 	
 	<h2>Seznam signatářů</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Podniky</text>
--- a/campaigns/pdfreaders/petition.de.xhtml
+++ b/campaigns/pdfreaders/petition.de.xhtml
@ -96,6 +96,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>-->

    <h2>Liste der Unterzeichner</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Organisationen</text>
--- a/campaigns/pdfreaders/petition.el.xhtml
+++ b/campaigns/pdfreaders/petition.el.xhtml
@ -367,6 +367,7 @@
 	
 	<h2>Κατάλογος με τους συνυπογράφοντες</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Επιχειρήσεις</text>
--- a/campaigns/pdfreaders/petition.en.xhtml
+++ b/campaigns/pdfreaders/petition.en.xhtml
@ -87,6 +87,7 @@
 	
 	<h2>List of signatories</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Businesses</text>
--- a/campaigns/pdfreaders/petition.es.xhtml
+++ b/campaigns/pdfreaders/petition.es.xhtml
@ -89,6 +89,7 @@ multinacionales en detrimento del Software Libre.</p>
    <hr />-->
    <h2>Lista de firmantes</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Organizaciones</text>
--- a/campaigns/pdfreaders/petition.et.xhtml
+++ b/campaigns/pdfreaders/petition.et.xhtml
@ -57,6 +57,7 @@
    <hr/>
    <p>Läbi selle ankeedi kogutud teavet kasutatakse ainult PDF-lugejate kampaania läbiviimiseks. Kui Te soovite oma nime eemaldamist allakirjutanute nimekirjast või lisainformatsiooni kogutud andmete hoiustamise kohta, siis võtke ühendust aadressil <a href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>-->
    <h2>Allakirjutanute nimekiri</h2>
+    <include-signatures/>
  </body>
  <text id="bsig">Ettevõtted</text>
  <text id="osig">Organisatsioonid</text>
--- a/campaigns/pdfreaders/petition.fr.xhtml
+++ b/campaigns/pdfreaders/petition.fr.xhtml
@ -91,6 +91,7 @@
 <p>Les informations recueillies par ce formulaire servent exclusivement à la gestion de la campagne PDF readers. Si vous souhaitez être retiré de la liste des signataires, ou obtenir des informations les données retenues, merci d'envoyer un mail à <a href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>
   --> <h2>Liste des signataires</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Organisations</text>
--- a/campaigns/pdfreaders/petition.hr.xhtml
+++ b/campaigns/pdfreaders/petition.hr.xhtml
@ -78,6 +78,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>-->

 <h2>Popis potpisnika</h2>

+  <include-signatures/>
 </body>

 <text id="bsig">Tvrtke</text>
--- a/campaigns/pdfreaders/petition.it.xhtml
+++ b/campaigns/pdfreaders/petition.it.xhtml
@ -95,6 +95,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>-->

    <h2>List of signatories</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Organizzazioni</text>
--- a/campaigns/pdfreaders/petition.nl.xhtml
+++ b/campaigns/pdfreaders/petition.nl.xhtml
@ -74,6 +74,7 @@
 	
 	--><h2>Lijst van ondertekenaars</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Bedrijven</text>
--- a/campaigns/pdfreaders/petition.pl.xhtml
+++ b/campaigns/pdfreaders/petition.pl.xhtml
@ -94,6 +94,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>
 	
 -->	<h2>Lista sygnatariuszy</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Firmy</text>
--- a/campaigns/pdfreaders/petition.pt.xhtml
+++ b/campaigns/pdfreaders/petition.pt.xhtml
@ -71,6 +71,7 @@
        <hr />
    <p><a title="Lista de signatários" href="">Os Abaixo-assinados</a>.</p>

+    <include-signatures/>
  </body>
  <text id="osig">Organizações</text>
  <text id="bsig">Empresas</text>
--- a/campaigns/pdfreaders/petition.ro.xhtml
+++ b/campaigns/pdfreaders/petition.ro.xhtml
@ -70,6 +70,7 @@

    <h2>Lista semnatarilor</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Organizations</text>
--- a/campaigns/pdfreaders/petition.ru.xhtml
+++ b/campaigns/pdfreaders/petition.ru.xhtml
@ -98,6 +98,7 @@ href="http://pdfreaders.org/graphics.ru.html">ссылаясь</a>
    
  -->  <h2>Список подписавших</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="osig">Организации</text>
--- a/campaigns/pdfreaders/petition.sv.xhtml
+++ b/campaigns/pdfreaders/petition.sv.xhtml
@ -85,6 +85,7 @@
 	
 -->	<h2>List of signatories</h2>
 	
+    <include-signatures/>
  </body>
  
  <text id="bsig">Businesses</text>
--- a/campaigns/pdfreaders/petition.xsl
+++ b/campaigns/pdfreaders/petition.xsl
@ -8,7 +8,7 @@
  <xsl:import href="../../fsfe.xsl" />
  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />

-  <xsl:template match="body">
+  <xsl:template match="/buildinfo/document/body/include-signatures">
      <xsl:apply-templates />
      
      <h3 id="organisations">
--- a/events/events.ca.xhtml
+++ b/events/events.ca.xhtml
@ -16,6 +16,8 @@
      Els esdeveniments de l'FSFE estan també disponibles via
      <a href="events.rss" class="feed">subscripció RSS</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Esdeveniments actuals</text>
--- a/events/events.da.xhtml
+++ b/events/events.da.xhtml
@ -17,6 +17,8 @@
      <a href="events.rss" class="feed">RSS-feed</a> samt som et 
      <a href="webcal://fsfe.org/events/events.en.ics">iCalendar-feed</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Aktuelle arrangementer</text>
--- a/events/events.de.xhtml
+++ b/events/events.de.xhtml
@ -18,6 +18,8 @@
      <a href="events.rss" class="feed">RSS-Feed</a> verfügbar als auch
      anhand unseres <a href="webcal://fsfe.org/events/events.de.ics">iCalendars</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Aktuelle Veranstaltungen</text>
--- a/events/events.el.xhtml
+++ b/events/events.el.xhtml
@ -22,6 +22,8 @@
        (ενημερωτικές περιλήψεις ιστοτόπων) καθώς επίσης και από τη
     <a href="webcal://fsfe.org/events/events.en.ics">ροή iCalendar</a>..
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Τρέχουσες εκδηλώσεις</text>
--- a/events/events.en.xhtml
+++ b/events/events.en.xhtml
@ -20,6 +20,8 @@
      <a href="events.rss" class="feed">RSS feed</a> as well as an
      <a href="webcal://fsfe.org/events/events.en.ics">iCalendar feed</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Current events</text>
--- a/events/events.es.xhtml
+++ b/events/events.es.xhtml
@ -16,6 +16,8 @@
      Los anuncios de los eventos de la FSFE están disponibles mediante un 
      <a href="events.rss" class="feed">feed RSS</a>, también como mediante un  <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Eventos actuales</text>
--- a/events/events.fi.xhtml
+++ b/events/events.fi.xhtml
@ -22,6 +22,8 @@
    
    <p>Kattavan kalenterin kaikista suomalaisista vapaisiin ohjelmistoihin liittyvistä tapahtumista löydät sivustolta <a href="http://coss.fi/kalenteri">coss.fi/kalenteri</a>.</p>
    
+
+    <include-events/>
  </body>

  <text id="current">Tämänhetkiset tapahtumat</text>
--- a/events/events.fr.xhtml
+++ b/events/events.fr.xhtml
@ -20,6 +20,8 @@
      <a href="events.rss">flux RSS</a> ainsi qu'avec notre
      <a href="webcal://fsfe.org/events/events.fr.ics">iCalendar</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Événements en cours</text>
--- a/events/events.hr.xhtml
+++ b/events/events.hr.xhtml
@ -16,6 +16,8 @@
      Najave FSFE-ovih događanja također su dostupne putem
      <a href="events.rss" class="feed">RSS-a</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Aktualna događanja</text>
--- a/events/events.hu.xhtml
+++ b/events/events.hu.xhtml
@ -18,6 +18,8 @@
    <p>
      Az FSFE események hírei elérhetőek <a href="events.rss">RSS-csatornán</a> is.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Aktuális események</text>
--- a/events/events.it.xhtml
+++ b/events/events.it.xhtml
@ -15,6 +15,8 @@
      Gli annunci degli eventi riguardanti la FSFE sono disponibili anche
      tramite <a href="events.rss" class="feed">feed RSS</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Eventi in corso</text>
--- a/events/events.nb.xhtml
+++ b/events/events.nb.xhtml
@ -13,6 +13,8 @@
    <p>FSFE varsler også begivenheter via en <a
 href="events.rss" class="feed">>RSS-strøm</a>.</p>

+
+    <include-events/>
  </body>
  <text id="current">Pågående begivenheter</text>
  <text id="future">Kommende begivenheter</text>
--- a/events/events.nl.xhtml
+++ b/events/events.nl.xhtml
@ -17,6 +17,8 @@
      <a href="events.rss" class="feed">RSS-</a> en
      <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>-formaat.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Huidige evenementen</text>
--- a/events/events.pl.xhtml
+++ b/events/events.pl.xhtml
@ -19,6 +19,8 @@
      <a href="events.rss" class="feed">kanał RSS</a> oraz
      <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Obecne wydarzenia</text>
--- a/events/events.pt.xhtml
+++ b/events/events.pt.xhtml
@ -16,6 +16,8 @@
      Os anúncios dos eventos da FSFE também estão disponíveis
      <a href="events.rss" class="feed">via RSS</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Eventos a decorrer</text>
--- a/events/events.ro.xhtml
+++ b/events/events.ro.xhtml
@ -20,6 +20,8 @@
      Anunţurile evenimentelor FSFE sunt deasemenea disponibile via
      <a href="events.rss">RSS feed</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Evenimente curente</text>
--- a/events/events.ru.xhtml
+++ b/events/events.ru.xhtml
@ -19,6 +19,8 @@
 <p>Узнать о предстоящих событиях можно через <a href="events.rss">ленту
 RSS</a> и <a href="webcal://fsfe.org/events/events.en.ics">ленту
 iCalendar</a>.  </p>
+
+  <include-events/>
 </body>

 <text id="current">Текущие события</text>
--- a/events/events.sq.xhtml
+++ b/events/events.sq.xhtml
@ -20,6 +20,8 @@
      <a href="events.rss" class="feed">një prurjeje RSS</a> si dhe përmes një
      <a href="webcal://fsfe.org/events/events.en.ics">prurjeje për iCalendar</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Veprimtari të tanishme</text>
--- a/events/events.sr.xhtml
+++ b/events/events.sr.xhtml
@ -20,6 +20,8 @@
    	<a href="events.rss" class="feed">RSS канала</a> као и преко
      <a href="webcal://fsfe.org/events/events.en.ics">iCalendar канала</a>.
    </p>
+
+    <include-events/>
  </body>

  <text id="current">Тренутна дешавања</text>
--- a/events/events.xsl
+++ b/events/events.xsl
@ -34,7 +34,7 @@
  </xsl:template>

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="body">
+  <xsl:template match="/buildinfo/document/body/include-events">
      <!-- First, include what's in the source file -->
      <xsl:apply-templates />
      
--- a/news/news.ca.xhtml
+++ b/news/news.ca.xhtml
@ -31,6 +31,8 @@
      A part de les notícies llistades en aquesta pàgina, l'FSFE
      també publica <a href="newsletter.html">butlletins de notícies mensuals</a>.
    </p>
+
+    <include-news/>
  </body>
  <text id="more">Llegiu-ne més...</text>
  <translator>Rafael Carreras</translator>
--- a/news/news.cs.xhtml
+++ b/news/news.cs.xhtml
@ -31,6 +31,8 @@
 	Mimo běžné novinky, zmíněné na teto stránce, vydává FSFE navíc 
      <a href="newsletter.html">měsíční zpravodaj</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Přečtěte si více...</text>
--- a/news/news.da.xhtml
+++ b/news/news.da.xhtml
@ -33,6 +33,8 @@
      Som et supplement til de almindelige nyheder på denne side, udsender FSFE
      et <a href="newsletter.html">månedligt nyhedsbrev</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Læs mere ...</text>
--- a/news/news.de.xhtml
+++ b/news/news.de.xhtml
@ -21,6 +21,8 @@
      erhältlich.
      <a href="news.rss" class="feed">RSS-Feed der Meldungen</a>
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Mehr …</text>
--- a/news/news.el.xhtml
+++ b/news/news.el.xhtml
@ -18,6 +18,8 @@
      διαθέσιμες από τους
      <a href="/about/fsfnetwork.html">ομοθυγατρικούς οργανισμούς</a> του FSFE.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Διαβάστε περισσότερα...</text>
--- a/news/news.en.xhtml
+++ b/news/news.en.xhtml
@ -17,6 +17,8 @@
      available from FSFE's <a href="/about/fsfnetwork.html">sister
        organisations</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Read more…</text>
--- a/news/news.es.xhtml
+++ b/news/news.es.xhtml
@ -22,6 +22,8 @@
      <a href="news.rss" class="feed">Canal de noticias RSS</a>
    </p>
    
+
+    <include-news/>
  </body>

  <text id="more">Leer más...</text>
--- a/news/news.et.xhtml
+++ b/news/news.et.xhtml
@ -31,6 +31,8 @@
      Lisaks regulaarsetele uudistele, FSFE
      omab <a href="newsletter.html">ka kuulist ajalehte</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Veel...</text>
--- a/news/news.fi.xhtml
+++ b/news/news.fi.xhtml
@ -20,6 +20,8 @@
    <p>
      Useimmat uutiset julkaistaan myös <a href="/press/index.html">lehdistötiedotteiden sähköpostilistoilla</a>, joille voit liittyä pysyäksesi FSFE:n toiminnasta ajan tasalla sähköpostitse. FSFE-uutiset ovat saatavilla myös <a href="news.rss">RSS-syötteenä</a>. Tavallisten tällä sivulla lueteltujen uutisten lisäksi FSFE julkaisee <a href="newsletter.html">kuukausittaista uutiskirjettä</a>. Maailmanlaajuisia uutisia vapaista ohjelmistoista löydät <a href="/about/fsfnetwork.html">sisarjärjestöiltämme</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Lue lisää...</text>
--- a/news/news.hr.xhtml
+++ b/news/news.hr.xhtml
@ -19,6 +19,8 @@
      <a href="news.rss" class="feed">Dostava vijesti RSS-om</a>
    </p>
    
+
+    <include-news/>
  </body>

  <text id="more">Pročitajte više...</text>
--- a/news/news.hu.xhtml
+++ b/news/news.hu.xhtml
@ -23,6 +23,8 @@
      Europe hírleveleket is publikál, melyek <a href="newsletter.html">egy
      külön oldalon</a> találhatóak archiválva.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Bővebben...</text>
--- a/news/news.it.xhtml
+++ b/news/news.it.xhtml
@ -19,6 +19,8 @@
    <a href="news.rss" class="feed">News RSS feed</a>
    </p>
    
+
+    <include-news/>
  </body>

  <text id="more">Continua a leggere...</text>
--- a/news/news.nb.xhtml
+++ b/news/news.nb.xhtml
@ -34,6 +34,8 @@
  <a href="newsletter.html">et månedlig nyhetsbrev</a>.
 </p>

+
+  <include-news/>
 </body>
 	<text id="more">Les mer...</text>
 	<translator>Andreas Tolf Tolfsen</translator>
--- a/news/news.nl.xhtml
+++ b/news/news.nl.xhtml
@ -16,6 +16,8 @@ campagnes en activiteiten. Meld u aan op de <a
        nieuwsbrieven</a> beschikbaar. Wereldwijd Vrije Software-nieuws is
      beschikbaar van FSFE's <a href="/about/fsfnetwork.html">zusterorganisaties.</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Lees meer…</text>
--- a/news/news.pt.xhtml
+++ b/news/news.pt.xhtml
@ -20,6 +20,8 @@
      <a href="news.rss" class="feed">Canal de notícias RSS</a>
    </p>
    
+
+    <include-news/>
  </body>

  <text id="more">Ler mais...</text>
--- a/news/news.ro.xhtml
+++ b/news/news.ro.xhtml
@ -24,6 +24,8 @@
 	<a href="newsletter.html">pe o pagina separată</a>.
    </p>
 	
+
+    <include-news/>
  </body>
  <text id="more">Citeşte mai mult...</text>
  <translator>Adi Roiban</translator>
--- a/news/news.ru.xhtml
+++ b/news/news.ru.xhtml
@ -16,6 +16,8 @@
 обеспечения можно получить от <a
 href="/about/fsfnetwork.html">родственных организаций</a> ЕФСПО.</p>

+
+  <include-news/>
 </body>
 <text id="more">Подробнее...</text>
 <timestamp>$Date$ $Author$</timestamp>
--- a/news/news.sl.xhtml
+++ b/news/news.sl.xhtml
@ -21,6 +21,8 @@
      Poleg rednih novic, najdenih na tej strani, FSFE izdaja
      <a href="newsletter.html">mesečni bilten</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Več...</text>
--- a/news/news.sq.xhtml
+++ b/news/news.sq.xhtml
@ -14,6 +14,8 @@
      pajtohuni te <a href="/news/news.rss">prurja jonë RSS</a> që të jeni
      të përditësuar rreth veprimtarive tona.  Ka të passhëm gjithashtu <a href="newsletter.html">buletine mujore</a>.   Lajme mbi Software-in e Lirë nga Bota mund të merren nga <a href="/about/fsfnetwork.html"> organizma simotra të FSFE-së</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Lexoni më tepër…</text>
--- a/news/news.sr.xhtml
+++ b/news/news.sr.xhtml
@ -14,6 +14,8 @@
    	Вести о Слободном Софверу широм света су доступни преко <a href="/about/fsfnetwork.html">сестринских 
    	организација</a> ФзССЕ-е.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Сазнај више…</text>
--- a/news/news.sv.xhtml
+++ b/news/news.sv.xhtml
@ -33,6 +33,8 @@
      publicerar FSFE även ett <a href="newsletter.html">månatligt
      nyhetsbrev</a>.
    </p>
+
+    <include-news/>
  </body>

  <text id="more">Läs mer...</text>
--- a/news/news.xsl
+++ b/news/news.xsl
@ -6,7 +6,7 @@
  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="body">
+  <xsl:template match="/buildinfo/document/body/include-news">
      <!-- First, include what's in the source file -->
      <xsl:apply-templates />

--- a/news/newsletter.ca.xhtml
+++ b/news/newsletter.ca.xhtml
@ -33,6 +33,8 @@
      Hi ha una altra pàgina que conté un arxiu de
      <a href="news.html">les notícies</a>.
    </p>
+
+    <include-newsletter/>
  </body>
  <text id="more">Llegiu-ne més...</text>
  <translator>Rafael Carreras</translator>
--- a/news/newsletter.cs.xhtml
+++ b/news/newsletter.cs.xhtml
@ -32,6 +32,8 @@
 Existuje ještě další stránka s archivem 
      <a href="news.html">běžných novinek</a>.
    </p>
+
+    <include-newsletter/>
  </body>

  <text id="more">Čtěte...</text>
--- a/news/newsletter.da.xhtml
+++ b/news/newsletter.da.xhtml
@ -20,6 +20,8 @@
    </p>

    <subscribe-nl />
+
+    <include-newsletter/>
  </body>

  <text id="more">Læs ...</text>
--- a/news/newsletter.de.xhtml
+++ b/news/newsletter.de.xhtml
@ -23,6 +23,8 @@
    <subscribe-nl />


+
+    <include-newsletter/>
  </body>

  <text id="more">Lesen …</text>
--- a/news/newsletter.el.xhtml
+++ b/news/newsletter.el.xhtml
@ -21,6 +21,8 @@
    
    <subscribe-nl />

+
+    <include-newsletter/>
  </body>

  <text id="more">Διαβάστε...</text>
--- a/news/newsletter.en.xhtml
+++ b/news/newsletter.en.xhtml
@ -22,6 +22,7 @@
    
    <subscribe-nl />

+    <include-newsletter/>
  </body>
 <text id="more">Read...</text> 
  <timestamp>$Date$ $Author$</timestamp>
--- a/news/newsletter.es.xhtml
+++ b/news/newsletter.es.xhtml
@ -14,6 +14,8 @@
      Además de nuestras <a href="news.html">noticias regulares</a>, la FSFE publica un boletín mensual que recoge sus actividades más importantes. Usted puede recibirlos por correo electrónico uniéndose a la <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-es">lista de distribución de notas de prensa</a>.
    </p>

+
+    <include-newsletter/>
  </body>

  <text id="more">Leer más...</text>
--- a/news/newsletter.fi.xhtml
+++ b/news/newsletter.fi.xhtml
@ -28,6 +28,8 @@
    
    <subscribe-nl />

+
+    <include-newsletter/>
  </body>

  <text id="more">Lue lisää...</text>
--- a/news/newsletter.fr.xhtml
+++ b/news/newsletter.fr.xhtml
@ -20,6 +20,8 @@
    
    <subscribe-nl />
  
+
+    <include-newsletter/>
  </body>

  <text id="more">Lire la suite...</text>
--- a/news/newsletter.hr.xhtml
+++ b/news/newsletter.hr.xhtml
@ -22,6 +22,8 @@
    
    <subscribe-nl />

+
+    <include-newsletter/>
  </body>

  <text id="more">Pročitajte...</text>
--- a/news/newsletter.hu.xhtml
+++ b/news/newsletter.hu.xhtml
@ -26,6 +26,8 @@
      Ezen az oldalon az eddigiekben kiadott hírleveleink találhatóak meg. <a
      href="news.html">Rendszeres híreink</a> archívuma külön oldalon van.
    </p>
+
+    <include-newsletter/>
  </body>

  <text id="more">Tovább...</text>
--- a/news/newsletter.it.xhtml
+++ b/news/newsletter.it.xhtml
@ -16,6 +16,8 @@
      alla <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-it">mailing list delle newsletter</a>.
    </p>

+
+    <include-newsletter/>
  </body>

  <text id="more">Leggi...</text>
--- a/news/newsletter.nb.xhtml
+++ b/news/newsletter.nb.xhtml
@ -29,6 +29,8 @@ e-post.</p>
 Det finnes en annen side som arkiverer <a
 href="news.html">vanlige nyhetsartkler</a>.</p>

+
+  <include-newsletter/>
 </body>
 	<text id="more">Les...</text>
 	<translator>Andreas Tolf Tolfsen</translator>
--- a/news/newsletter.nl.xhtml
+++ b/news/newsletter.nl.xhtml
@ -35,6 +35,8 @@
      overzicht van al de verzonden <a href="news.html">
      persberichten</a>.
    </p>
+
+    <include-newsletter/>
  </body>

  <text id="more">Lees meer...</text>
--- a/news/newsletter.pt.xhtml
+++ b/news/newsletter.pt.xhtml
@ -14,6 +14,8 @@
      Além das nossas <a href="news.html">notícias regulares</a>, a FSFE publica um boletim mensal que recolhe as suas atividades mais importantes. Você pode recebê-los por correio eletrônico unindo-se à <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-pt">lista de distribuição de comunicados de imprensa</a>.
    </p>

+
+    <include-newsletter/>
  </body>

  <text id="more">Ler mais...</text>
--- a/news/newsletter.ru.xhtml
+++ b/news/newsletter.ru.xhtml
@ -22,6 +22,8 @@
    
 <subscribe-nl />

+
+  <include-newsletter/>
 </body>

 <text id="more">Подробнее...</text>
--- a/news/newsletter.sq.xhtml
+++ b/news/newsletter.sq.xhtml
@ -22,6 +22,8 @@
    
    <subscribe-nl />

+
+    <include-newsletter/>
  </body>
 <text id="more">Lexojeni...</text> 
  <timestamp>$Date$ $Author$</timestamp>
--- a/news/newsletter.sv.xhtml
+++ b/news/newsletter.sv.xhtml
@ -33,6 +33,8 @@
      en annan sida som innehåller arkivet för våra
      <a href="news.html">vanliga nyheter</a>.
    </p>
+
+    <include-newsletter/>
  </body>

  <text id="more">Läs...</text>
--- a/news/newsletter.xsl
+++ b/news/newsletter.xsl
@ -7,7 +7,7 @@

  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />

-  <xsl:template match="body">
+  <xsl:template match="/buildinfo/document/body/include-newsletter">
    <xsl:apply-templates />

    <!-- $today = current date (given as <html date="...">) -->