From 91dda715ad042e3fdfbea7f3fee640f6b41fd180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20M=C3=BCller?= <reinhard@fsfe.org>
Date: Sun, 26 Apr 2020 19:24:16 +0200
Subject: [PATCH] Remove unnecessary filtering of news/event feeds

The build script only includes the XML files containing news and events
of the matching tag anyway, so there's absolutely no need to filter by
tag again in the XSL stylesheet.
---
 activities/education/education.xsl                | 9 ---------
 activities/os/os.xsl                              | 2 --
 activities/procurement/procurement.xsl            | 2 --
 activities/radiodirective/radiodirective.xsl      | 2 --
 activities/routers/routers.xsl                    | 2 --
 at/at.xsl                                         | 9 ---------
 campaigns/askyourcandidates/askyourcandidates.xsl | 2 --
 campaigns/ilovefs/2012/ilovefs.xsl                | 2 --
 campaigns/ilovefs/2012/unperfekthaus.xsl          | 2 --
 campaigns/ilovefs/2013/ilovefs.xsl                | 2 --
 campaigns/ilovefs/2014/ilovefs.xsl                | 2 --
 campaigns/ilovefs/2015/ilovefs.xsl                | 2 --
 campaigns/ilovefs/2016/index.xsl                  | 1 -
 campaigns/ilovefs/2017/index.xsl                  | 1 -
 campaigns/ilovefs/2018/index.xsl                  | 1 -
 campaigns/ilovefs/2019/index.xsl                  | 1 -
 campaigns/ilovefs/2020/index.xsl                  | 1 -
 campaigns/nledu/nledu.xsl                         | 2 --
 campaigns/publiccode/bea.xsl                      | 1 -
 campaigns/publiccode/publiccode.xsl               | 1 -
 de/de.xsl                                         | 5 -----
 ee/ee.xsl                                         | 9 ---------
 fi/fi.xsl                                         | 9 ---------
 fr/fr.xsl                                         | 9 ---------
 fsfe.xsl                                          | 8 --------
 index.xsl                                         | 2 --
 it/it.xsl                                         | 9 ---------
 news/legal-news.sources                           | 4 ++--
 news/legal-news.xsl                               | 4 +---
 tools/xsltsl/tagging.xsl                          | 6 ------
 uk/uk.xsl                                         | 9 ---------
 31 files changed, 3 insertions(+), 118 deletions(-)

diff --git a/activities/education/education.xsl b/activities/education/education.xsl
index 6d2fd58b5b..c7c58a1c13 100644
--- a/activities/education/education.xsl
+++ b/activities/education/education.xsl
@@ -95,9 +95,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="education" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -107,9 +104,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="education" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -117,9 +111,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="education" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/activities/os/os.xsl b/activities/os/os.xsl
index cee38d856b..e10bc00005 100644
--- a/activities/os/os.xsl
+++ b/activities/os/os.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'OpenStandards'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/activities/procurement/procurement.xsl b/activities/procurement/procurement.xsl
index 66befb96db..e6210ad19c 100644
--- a/activities/procurement/procurement.xsl
+++ b/activities/procurement/procurement.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'Procurement'"/>
       <xsl:with-param name="nb-items" select="15"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/activities/radiodirective/radiodirective.xsl b/activities/radiodirective/radiodirective.xsl
index 1d6c616b67..6e14f3eaac 100644
--- a/activities/radiodirective/radiodirective.xsl
+++ b/activities/radiodirective/radiodirective.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'RadioDirective'"/>
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
diff --git a/activities/routers/routers.xsl b/activities/routers/routers.xsl
index 6d22b1a55b..e6210ad19c 100644
--- a/activities/routers/routers.xsl
+++ b/activities/routers/routers.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'routers'"/>
       <xsl:with-param name="nb-items" select="15"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/at/at.xsl b/at/at.xsl
index a900f14ece..1d4c14c4e6 100644
--- a/at/at.xsl
+++ b/at/at.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -119,9 +116,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -129,9 +123,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/campaigns/askyourcandidates/askyourcandidates.xsl b/campaigns/askyourcandidates/askyourcandidates.xsl
index 11220ab8a3..e10bc00005 100755
--- a/campaigns/askyourcandidates/askyourcandidates.xsl
+++ b/campaigns/askyourcandidates/askyourcandidates.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'AskYourCandidates'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2012/ilovefs.xsl b/campaigns/ilovefs/2012/ilovefs.xsl
index 0ccbd3862b..fd9cdd5c80 100755
--- a/campaigns/ilovefs/2012/ilovefs.xsl
+++ b/campaigns/ilovefs/2012/ilovefs.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2012/unperfekthaus.xsl b/campaigns/ilovefs/2012/unperfekthaus.xsl
index 0ccbd3862b..fd9cdd5c80 100755
--- a/campaigns/ilovefs/2012/unperfekthaus.xsl
+++ b/campaigns/ilovefs/2012/unperfekthaus.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2013/ilovefs.xsl b/campaigns/ilovefs/2013/ilovefs.xsl
index 0ccbd3862b..fd9cdd5c80 100755
--- a/campaigns/ilovefs/2013/ilovefs.xsl
+++ b/campaigns/ilovefs/2013/ilovefs.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2014/ilovefs.xsl b/campaigns/ilovefs/2014/ilovefs.xsl
index 0ccbd3862b..fd9cdd5c80 100755
--- a/campaigns/ilovefs/2014/ilovefs.xsl
+++ b/campaigns/ilovefs/2014/ilovefs.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2015/ilovefs.xsl b/campaigns/ilovefs/2015/ilovefs.xsl
index 0ccbd3862b..fd9cdd5c80 100755
--- a/campaigns/ilovefs/2015/ilovefs.xsl
+++ b/campaigns/ilovefs/2015/ilovefs.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2016/index.xsl b/campaigns/ilovefs/2016/index.xsl
index 4bb9cf4ec7..f05252cb6d 100755
--- a/campaigns/ilovefs/2016/index.xsl
+++ b/campaigns/ilovefs/2016/index.xsl
@@ -9,7 +9,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2017/index.xsl b/campaigns/ilovefs/2017/index.xsl
index 9773917a8d..ac73ab5f95 100755
--- a/campaigns/ilovefs/2017/index.xsl
+++ b/campaigns/ilovefs/2017/index.xsl
@@ -9,7 +9,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2018/index.xsl b/campaigns/ilovefs/2018/index.xsl
index 9773917a8d..ac73ab5f95 100755
--- a/campaigns/ilovefs/2018/index.xsl
+++ b/campaigns/ilovefs/2018/index.xsl
@@ -9,7 +9,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2019/index.xsl b/campaigns/ilovefs/2019/index.xsl
index 9773917a8d..ac73ab5f95 100755
--- a/campaigns/ilovefs/2019/index.xsl
+++ b/campaigns/ilovefs/2019/index.xsl
@@ -9,7 +9,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/ilovefs/2020/index.xsl b/campaigns/ilovefs/2020/index.xsl
index 52147957af..b8756acb33 100755
--- a/campaigns/ilovefs/2020/index.xsl
+++ b/campaigns/ilovefs/2020/index.xsl
@@ -9,7 +9,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'ilovefs'"/>
       <xsl:with-param name="nb-items" select="2"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/nledu/nledu.xsl b/campaigns/nledu/nledu.xsl
index d4e024ee6c..e10bc00005 100755
--- a/campaigns/nledu/nledu.xsl
+++ b/campaigns/nledu/nledu.xsl
@@ -7,10 +7,8 @@
   <xsl:import href="../../fsfe.xsl" />
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'nledu'"/>
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
diff --git a/campaigns/publiccode/bea.xsl b/campaigns/publiccode/bea.xsl
index 27a8ae4ed4..6f0f296447 100644
--- a/campaigns/publiccode/bea.xsl
+++ b/campaigns/publiccode/bea.xsl
@@ -15,7 +15,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'bea'"/>
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
diff --git a/campaigns/publiccode/publiccode.xsl b/campaigns/publiccode/publiccode.xsl
index d20a421df3..d3eef6aabd 100644
--- a/campaigns/publiccode/publiccode.xsl
+++ b/campaigns/publiccode/publiccode.xsl
@@ -10,7 +10,6 @@
   
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'pmpc'"/>
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
diff --git a/de/de.xsl b/de/de.xsl
index efe594108f..c5741c2d0a 100644
--- a/de/de.xsl
+++ b/de/de.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -120,14 +117,12 @@
     <!-- Current events -->
     <xsl:call-template name="fetch-events">
       <xsl:with-param name="wanted-time" select="'present'" />
-      <xsl:with-param name="tag">de</xsl:with-param>
       <xsl:with-param name="display-details" select="'yes'" />
     </xsl:call-template>
     
     <!-- Future events -->
     <xsl:call-template name="fetch-events">
       <xsl:with-param name="wanted-time" select="'future'" />
-      <xsl:with-param name="tag">de</xsl:with-param>
       <xsl:with-param name="display-details" select="'yes'" />
       <xsl:with-param name="nb-items" select="3" />
       <!--FIXME ↑ why is it showing one more?-->
diff --git a/ee/ee.xsl b/ee/ee.xsl
index c14ac8dece..59bae358ca 100644
--- a/ee/ee.xsl
+++ b/ee/ee.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -119,9 +116,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -129,9 +123,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/fi/fi.xsl b/fi/fi.xsl
index a76c9851f2..828a889ae2 100644
--- a/fi/fi.xsl
+++ b/fi/fi.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -119,9 +116,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -129,9 +123,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/fr/fr.xsl b/fr/fr.xsl
index 5c1d77e4d3..ec0d4fe617 100644
--- a/fr/fr.xsl
+++ b/fr/fr.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -119,9 +116,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -129,9 +123,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="2" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/fsfe.xsl b/fsfe.xsl
index a404731a73..fd79bac083 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -78,14 +78,6 @@
     <xsl:apply-templates select="@*|node()"/>
   </xsl:template>
   
- <!--FIXME ↓-->
-  <xsl:template match="fetch-news">
-    <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'/buildinfo/document/sidebar/@news'"/>
-      <xsl:with-param name="nb-items" select="4"/>
-    </xsl:call-template>
-  </xsl:template>
-  
   <!-- Static elements which can be included everywhere -->
   <xsl:template match="static-element">
     <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
diff --git a/index.xsl b/index.xsl
index 7f297522d3..95aa489e2f 100644
--- a/index.xsl
+++ b/index.xsl
@@ -12,7 +12,6 @@
   <xsl:template match="dynamic-content-news">
     <xsl:for-each select="/buildinfo/document/set/news[
         translate(@date, '-', '') &lt;= translate($today, '-', '')
-        and (tags/tag/@key = 'front-page')
       ]">
       <xsl:sort select="@date" order="descending"/>
       <xsl:if test="position() &lt;= 3">
@@ -161,7 +160,6 @@
   <xsl:template match="dynamic-content-events">
     <xsl:for-each select="/buildinfo/document/set/event[
         translate (@end, '-', '') &gt;= translate ($today, '-', '')
-        and (tags/tag/@key = 'front-page')
       ]">
       <xsl:sort select="@start"/>
       <xsl:if test="position() &lt;= 3">
diff --git a/it/it.xsl b/it/it.xsl
index 62ccf140ca..b18392c820 100644
--- a/it/it.xsl
+++ b/it/it.xsl
@@ -107,9 +107,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -119,9 +116,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -129,9 +123,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>
diff --git a/news/legal-news.sources b/news/legal-news.sources
index 6cfdea62b3..247bc5da0a 100644
--- a/news/legal-news.sources
+++ b/news/legal-news.sources
@@ -1,2 +1,2 @@
-news/*/news-*:[legal news]
-news/*/.news-*:[legal news]
+news/*/news-*:[legal-news]
+news/*/.news-*:[legal-news]
diff --git a/news/legal-news.xsl b/news/legal-news.xsl
index 748565f45f..ea36401d44 100644
--- a/news/legal-news.xsl
+++ b/news/legal-news.xsl
@@ -7,9 +7,7 @@
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <xsl:template match="legal-news">
-    <xsl:call-template name="fetch-news">
-      <xsl:with-param name="tag" select="'legal-news'" />
-    </xsl:call-template>
+    <xsl:call-template name="fetch-news"/>
   </xsl:template>
   
 </xsl:stylesheet>
diff --git a/tools/xsltsl/tagging.xsl b/tools/xsltsl/tagging.xsl
index 5a6f3e70f1..2b9c894198 100644
--- a/tools/xsltsl/tagging.xsl
+++ b/tools/xsltsl/tagging.xsl
@@ -9,7 +9,6 @@
   <!--display dynamic list of tagged news items-->
 
   <xsl:template name="fetch-news">
-    <xsl:param name="tag" select="''"/>
     <xsl:param name="today" select="/buildinfo/@date" />
     <xsl:param name="nb-items" select="''" />
     <xsl:param name="display-year" select="'yes'" />
@@ -19,7 +18,6 @@
 
     <xsl:for-each select="/buildinfo/document/set/news[
         translate(@date, '-', '') &lt;= translate($today, '-', '')
-        and (tags/tag/@key = $tag or $tag='')
       ]">
       <xsl:sort select="@date" order="descending" />
 
@@ -37,7 +35,6 @@
   <!--display dynamic list of tagged event items-->
 
   <xsl:template name="fetch-events">
-    <xsl:param name="tag" select="''"/>
     <xsl:param name="today" select="/buildinfo/@date" />
     <xsl:param name="wanted-time" select="future" /> <!-- value in {"past", "present", "future"} -->
     <xsl:param name="header" select="''" />
@@ -50,7 +47,6 @@
       <!-- Past events -->
       <xsl:for-each select="/buildinfo/document/set/event[
           translate (@end, '-', '') &lt; translate ($today, '-', '')
-          and (tags/tag/@key = $tag or $tag='')
         ]">
         <xsl:sort select="@end" order="descending" />
         <xsl:if test="position() &lt;= $nb-items or $nb-items=''">
@@ -68,7 +64,6 @@
       <xsl:for-each select="/buildinfo/document/set/event[
           translate (@start, '-', '') &lt;= translate ($today, '-', '')
           and translate (@end,   '-', '') &gt;= translate ($today, '-', '')
-          and (tags/tag/@key = $tag or $tag='')
         ]">
         <xsl:sort select="@start" order="descending" />
         <xsl:if test="position() &lt;= $nb-items or $nb-items=''">
@@ -85,7 +80,6 @@
       <!-- Future events -->
       <xsl:for-each select="/buildinfo/document/set/event[
           translate (@start, '-', '') &gt; translate ($today, '-', '')
-          and (tags/tag/@key = $tag or $tag='')
         ]">
         <xsl:sort select="@start" />
         <xsl:if test="position() &lt;= $nb-items or $nb-items=''">
diff --git a/uk/uk.xsl b/uk/uk.xsl
index 7336e82299..cf57f02cfc 100644
--- a/uk/uk.xsl
+++ b/uk/uk.xsl
@@ -106,9 +106,6 @@
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
@@ -118,9 +115,6 @@
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
         
@@ -128,9 +122,6 @@
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
-            <xsl:with-param name="tag">
-                <xsl:value-of select="$country-code" />
-            </xsl:with-param>
             <xsl:with-param name="display-details" select="'yes'" />
         </xsl:call-template>
     </xsl:template>