Should solve #5623 Co-authored-by: Darragh Elliott <me@delliott.net> Reviewed-on: #5630 Co-authored-by: delliott <delliott@fsfe.org> Co-committed-by: delliott <delliott@fsfe.org>
This commit was merged in pull request #5630.
This commit is contained in:
Darragh Elliott
@@ -21,15 +21,20 @@
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="module-wrapper news">
|
||||
<module id="follow-news"/>
|
||||
<module id="social-media"/>
|
||||
<module id="banner-subscribe"/>
|
||||
</div>
|
||||
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
|
||||
<banner1><module id="banner-subscribe"/></banner1>
|
||||
<banner2><module id="banner-become-supporter"/></banner2>
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -108,4 +108,17 @@
|
||||
<xsl:apply-templates select="."/>
|
||||
</xsl:for-each>
|
||||
</xsl:template>
|
||||
<!-- Follow for more information -->
|
||||
<xsl:template match="more-updates">
|
||||
<p>
|
||||
<xsl:call-template name="gettext">
|
||||
<xsl:with-param name="id" select="'more-updates'"/>
|
||||
</xsl:call-template>
|
||||
</p>
|
||||
<div class="module-wrapper news">
|
||||
<xsl:apply-templates select="/buildinfo/document/banner1/node()"/>
|
||||
<xsl:apply-templates select="/buildinfo/document/follow-news/node()"/>
|
||||
<xsl:apply-templates select="/buildinfo/document/social-media/node()"/>
|
||||
</div>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
|
||||
@@ -1,30 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<version>3</version>
|
||||
<head>
|
||||
|
||||
|
||||
<title>FSFE – Newsletter</title>
|
||||
<title>FSFE – Newsletter</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p id="category"><a href="news.html">Nachrichten</a></p>
|
||||
<h1>Newsletter</h1>
|
||||
<p id="introduction">
|
||||
Zusätzlich zu unseren <a href="news.html">regelmäßigen Meldungen</a>
|
||||
veröffentlicht die FSFE jeden Monat einen Newsletter, in dem über die
|
||||
wichtigsten Aktivitäten berichtet wird.
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Monatlicher Newsletter über Neuigkeiten bei Freier Software und Informationen von der Free Software Foundation Europe</description>
|
||||
|
||||
<text id="more">Lesen …</text>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -1,30 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<version>3</version>
|
||||
<head>
|
||||
|
||||
|
||||
<title>Newsletters</title>
|
||||
<title>Newsletters</title>
|
||||
</head>
|
||||
|
||||
<body class="ltr">
|
||||
<p id="category"><a href="news.html">News</a></p>
|
||||
<h1>Newsletters</h1>
|
||||
<p id="introduction">
|
||||
In addition to our <a href="news.html">regular news stories</a>, each
|
||||
month FSFE issues a newsletter that summarises its
|
||||
most important activities.
|
||||
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
</p>
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Monthly newsletter about Free Software progress and advocacy from the Free Software Foundation Europe</description>
|
||||
<text id="more">Read...</text>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<version>3</version>
|
||||
<head>
|
||||
|
||||
|
||||
<title>Boletín de noticias</title>
|
||||
<title>Boletín de noticias</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p id="category"><a href="news.html">Archivo de Noticias</a></p>
|
||||
<h1>Boletín de noticias</h1>
|
||||
<p id="introduction">
|
||||
Además de nuestras <a href="news.html">noticias habituales</a>, cada
|
||||
@@ -16,16 +13,21 @@
|
||||
actividades más importantes.
|
||||
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Boletín de noticias mensual sobre el progreso y la defensa de los derechos del Software Libre
|
||||
de la Free Software Foundation Europe</description>
|
||||
<text id="more">Leer...</text>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<version>3</version>
|
||||
<head>
|
||||
|
||||
|
||||
<title>Lettres d'information</title>
|
||||
<title>Lettres d'information</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p id="category"><a href="news.html">Archive des nouvelles</a></p>
|
||||
<h1>Lettres d'information</h1>
|
||||
|
||||
<p id="introduction">
|
||||
<p id="introduction">
|
||||
En complément de nos <a href="news.html">communiqués de presse réguliers</a>, la FSFE publie chaque mois une lettre d'information qui résume ses activités.
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Monthly newsletter about Free Software progress and advocacy from the Free Software Foundation Europe</description>
|
||||
|
||||
<text id="more">Lire la suite...</text>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<version>3</version>
|
||||
<head>
|
||||
|
||||
|
||||
<title>Newsletter</title>
|
||||
<title>Newsletter</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p id="category"><a href="news.html">Notizie</a></p>
|
||||
<h1>Newsletter</h1>
|
||||
<p id="introduction">
|
||||
Oltre fornire le <a href="news.html">notizie</a>, ogni
|
||||
@@ -16,16 +13,21 @@
|
||||
attività svolte o di interesse dell'associazione.
|
||||
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Newsletter mensile su diffusione e difesa del Software Libero della Free Software Foundation Europe</description>
|
||||
<text id="more">Leggi...</text>
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
<translator>Sebastiano Pistore</translator>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
</html>
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<html>
|
||||
<version>2</version>
|
||||
|
||||
<head>
|
||||
<title>Nieuwsbrieven</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>Nieuwsbrieven</h1>
|
||||
<p id="introduction">
|
||||
<version>3</version>
|
||||
<head>
|
||||
<title>Nieuwsbrieven</title>
|
||||
</head>
|
||||
<body>
|
||||
<p id="category"><a href="news.html">Nieuws</a></p>
|
||||
<h1>Nieuwsbrieven</h1>
|
||||
<p id="introduction">
|
||||
In aanvulling op onze <a href="news.html">reguliere nieuwsverhalen</a> publiceert FSFE iedere maand een nieuwsbrief waarin haar belangrijkste activiteiten zijn samengevat.
|
||||
|
||||
</p>
|
||||
|
||||
<module id="banner-subscribe"/>
|
||||
|
||||
<include-newsletter/>
|
||||
</body>
|
||||
<description>Maandelijkse nieuwsbrief over vooruitgang en promotie van Vrije Software van de Free Software Foundation Europe</description>
|
||||
<text id="more">Lees...</text>
|
||||
<translator>André Ockers</translator>
|
||||
</html><!--
|
||||
Local Variables: ***
|
||||
mode: xml ***
|
||||
End: ***
|
||||
-->
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
<description>Maandelijkse nieuwsbrief over vooruitgang en promotie van Vrije Software van de Free Software Foundation Europe</description>
|
||||
<translator>André Ockers</translator>
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
|
||||
<xsl:import href="../fsfe.xsl"/>
|
||||
<xsl:import href="../../global/xslt/internal/static-elements.xsl"/>
|
||||
<xsl:template match="/buildinfo/document/body/include-newsletter">
|
||||
<xsl:apply-templates/>
|
||||
<xsl:for-each select="/buildinfo/document/set/news[ translate(@date, '-', '') <= translate(/buildinfo/@date, '-', '') ]">
|
||||
<xsl:sort select="@date" order="descending"/>
|
||||
<p>
|
||||
<b>
|
||||
<xsl:value-of select="@date"/>
|
||||
</b>
|
||||
<br/>
|
||||
<xsl:value-of select="body"/>
|
||||
<xsl:variable name="link">
|
||||
<xsl:value-of select="link"/>
|
||||
</xsl:variable>
|
||||
<xsl:if test="$link!=''">
|
||||
<a href="{link}" class="learn-more"><xsl:value-of select="/buildinfo/document/text[@id='more']"/></a>
|
||||
</xsl:if>
|
||||
</p>
|
||||
</xsl:for-each>
|
||||
</xsl:template>
|
||||
<!--translated sentence "receive-newsletter"-->
|
||||
<xsl:template match="receive-newsletter">
|
||||
<xsl:call-template name="gettext">
|
||||
<xsl:with-param name="id" select="'receive-newsletter'"/>
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
@@ -27,22 +27,22 @@
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
You can also receive regular updates and deeper insights on our other
|
||||
channels:
|
||||
</p>
|
||||
|
||||
<div class="module-wrapper podcast">
|
||||
<module id="follow-news"/>
|
||||
<module id="social-media"/>
|
||||
<module id="banner-subscribe"/>
|
||||
</div>
|
||||
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
|
||||
<description>Regular Podcast about Free Software progress and advocacy from the Free Software Foundation Europe</description>
|
||||
|
||||
<banner1><module id="banner-subscribe"/></banner1>
|
||||
<banner2><module id="banner-become-supporter"/></banner2>
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
</html>
|
||||
|
||||
@@ -26,23 +26,23 @@
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
U kunt ook regelmatig updates en diepere inzichten ontvangen op onze andere
|
||||
kanalen:
|
||||
</p>
|
||||
|
||||
<div class="module-wrapper podcast">
|
||||
<module id="follow-news"/>
|
||||
<module id="social-media"/>
|
||||
<module id="banner-subscribe"/>
|
||||
</div>
|
||||
|
||||
<more-updates/>
|
||||
<include-news/>
|
||||
</body>
|
||||
|
||||
<description>Reguliere podcast over vooruitgang en het voorvechten van Vrije Software, van de Free Software Foundation Europe</description>
|
||||
|
||||
<banner1><module id="banner-subscribe"/></banner1>
|
||||
<banner2><module id="banner-become-supporter"/></banner2>
|
||||
<banner1>
|
||||
<module id="banner-subscribe"/>
|
||||
</banner1>
|
||||
<banner2>
|
||||
<module id="banner-become-supporter"/>
|
||||
</banner2>
|
||||
<follow-news>
|
||||
<module id="follow-news"/>
|
||||
</follow-news>
|
||||
<social-media>
|
||||
<module id="social-media"/>
|
||||
</social-media>
|
||||
<translator>André Ockers</translator>
|
||||
</html>
|
||||
|
||||
@@ -150,6 +150,7 @@
|
||||
<text id="related-news">Related News</text>
|
||||
<text id="related-events">Related Events</text>
|
||||
<text id="related-all">All related news and events</text>
|
||||
<text id="more-updates">You can also receive regular updates and deeper insights on our other channels:</text>
|
||||
|
||||
|
||||
<!-- Sidebars -->
|
||||
|
||||
@@ -139,6 +139,7 @@ evenementen, activiteiten en hoe u hieraan kunt bijdragen.</text>
|
||||
<text id="related-news">Verwant nieuws</text>
|
||||
<text id="related-events">Verwante evenementen</text>
|
||||
<text id="related-all">Alle verwante nieuws en evenementen</text>
|
||||
<text id="more-updates">U kunt ook regelmatig updates en diepere inzichten ontvangen op onze andere kanalen:</text>
|
||||
|
||||
|
||||
<!-- Sidebars -->
|
||||
|
||||
Reference in New Issue
Block a user