From 2095b8b76df004a442715603365f77a26b590656 Mon Sep 17 00:00:00 2001
From: samtuke <samtuke@fsfe.org>
Date: Tue, 11 Jan 2011 15:19:08 +0000
Subject: [PATCH] removed text tags from old index pages to move them into new
 centralised file, set index.xsl to use global textset

svn path=/branches/design/; revision=19101
---
 index.bg.xhtml |  5 +----
 index.ca.xhtml |  5 -----
 index.cs.xhtml |  5 +----
 index.da.xhtml |  5 +----
 index.el.xhtml |  5 -----
 index.en.xhtml |  8 ++++----
 index.es.xhtml |  5 +----
 index.et.xhtml |  5 -----
 index.fi.xhtml |  5 +----
 index.fr.xhtml |  5 +----
 index.hr.xhtml |  5 +----
 index.hu.xhtml |  5 +----
 index.it.xhtml |  5 +----
 index.ku.xhtml | 11 +++--------
 index.mk.xhtml |  6 +-----
 index.nb.xhtml |  5 +----
 index.nl.xhtml |  5 +----
 index.nn.xhtml |  6 +-----
 index.pl.xhtml |  6 +-----
 index.pt.xhtml |  6 +-----
 index.ro.xhtml |  6 +-----
 index.ru.xhtml |  5 +----
 index.sk.xhtml |  6 +-----
 index.sl.xhtml |  6 ------
 index.sq.xhtml |  6 +-----
 index.sr.xhtml |  6 +-----
 index.sv.xhtml |  6 +-----
 index.tr.xhtml |  6 +-----
 index.xsl      | 28 +++++++++++++++++++++++++++-
 29 files changed, 56 insertions(+), 132 deletions(-)

diff --git a/index.bg.xhtml b/index.bg.xhtml
index 47cba70ebd..5562bed597 100644
--- a/index.bg.xhtml
+++ b/index.bg.xhtml
@@ -27,10 +27,7 @@
     </p>
   </body>
 
-  <text id="news">Последни новини</text>
-  <text id="events">Предстоящи събития</text>
-  <text id="morenews">Още новини…</text>
-  <text id="moreevents">Още събития…</text>
+
 
   <translator>Пламен Стоев</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.ca.xhtml b/index.ca.xhtml
index 162e50be48..d999b21765 100644
--- a/index.ca.xhtml
+++ b/index.ca.xhtml
@@ -28,11 +28,6 @@
     </p>
   </body>
 
-  <text id="news">Notícies recents</text>
-  <text id="events">Propers esdeveniments</text>
-  <text id="morenews">Més notícies…</text>
-  <text id="moreevents">Més esdeveniments…</text>
-
   <translator>SCA</translator>
   <timestamp>$Date$ $Author$</timestamp>
 </html>
diff --git a/index.cs.xhtml b/index.cs.xhtml
index db6ed28f91..ab6dd7865a 100644
--- a/index.cs.xhtml
+++ b/index.cs.xhtml
@@ -29,10 +29,7 @@
     </p>
   </body>
 
-  <text id="news">Nejnovější zprávy</text>
-  <text id="events">Nastávající události</text>
-  <text id="morenews">Další zprávy…</text>
-  <text id="moreevents">Další události…</text>
+
 
   <translator>Michael Hrabánek</translator> 
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.da.xhtml b/index.da.xhtml
index 191f3751be..55fa040ecc 100644
--- a/index.da.xhtml
+++ b/index.da.xhtml
@@ -31,10 +31,7 @@
     </p>
   </body>
 
-  <text id="news">Seneste nyt</text>
-  <text id="events">Kommende begivenheder</text>
-  <text id="morenews">Flere nyheder…</text>
-  <text id="moreevents">Flere begivenheder…</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>
diff --git a/index.el.xhtml b/index.el.xhtml
index 481f8ebbd3..08f6f15f0b 100644
--- a/index.el.xhtml
+++ b/index.el.xhtml
@@ -32,11 +32,6 @@
     </p>
   </body>
 
-  <text id="news">Τελευταία νέα</text>
-  <text id="events">Επόμενες εκδηλώσεις</text>
-  <text id="morenews">Περισσότερα νέα…</text>
-  <text id="moreevents">Περισσότερες εκδηλώσεις…</text>
-
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
diff --git a/index.en.xhtml b/index.en.xhtml
index 5f76b4c3df..b5ebe06a87 100644
--- a/index.en.xhtml
+++ b/index.en.xhtml
@@ -34,7 +34,7 @@
 	  <a class="rss-feed" href="/news.rss"><img src="/graphics/rss.png" alt="News RSS" title="news RSS feed" /></a>
 	  <a class="ical" href="http://identi.ca/fsfe"><img src="/graphics/identica.png" alt="identica" title="follow FSFE on identi.ca"/></a>
 	  
-	  <a href="/news/news.html">News</a>
+	  <a href="/news/news.html"><news-label /></a>
 	  
 	</h2>
       
@@ -43,7 +43,7 @@
       </div><!--end #news-->   
 
       <div id="newsletter" class="section">
-	<h2><a href="/news/newsletter.html">Newsletter</a></h2>
+	<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
 	
 	<div class="entry">
 	  <p>
@@ -75,7 +75,7 @@
 	  
 	    <all-newsletters />
 	    
-	    <li><a href="news/newsletter.html">More...</a></li>
+	    <li><a href="news/newsletter.html"><more-label />...</a></li>
 	    
 	  </ul>
 
@@ -87,7 +87,7 @@
 	  <a class="rss-feed" href="/events.rss"><img src="/graphics/rss.png" alt="Events RSS" title="events RSS feed" /></a>
 	  <a class="ical" href="webcal://fsfe.org/events/events.ics"><img src="/graphics/ical.png" alt="iCal" title="FSFE events as iCal feed" /></a>
 	  
-	  <a href="/events/events.html">Events</a>
+	  <a href="/events/events.html"><events-label /></a>
 	  
 	</h2>
     
diff --git a/index.es.xhtml b/index.es.xhtml
index d9495ff172..4b10bd6d94 100644
--- a/index.es.xhtml
+++ b/index.es.xhtml
@@ -29,10 +29,7 @@
     </p>
   </body>
 
-  <text id="news">Últimas noticias</text>
-  <text id="events">Próximos eventos</text>
-  <text id="morenews">Más noticias…</text>
-  <text id="moreevents">Más eventos…</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>
diff --git a/index.et.xhtml b/index.et.xhtml
index e1cb93320e..d3aa79b1d3 100644
--- a/index.et.xhtml
+++ b/index.et.xhtml
@@ -28,11 +28,6 @@
     </p>
   </body>
 
-  <text id="news">Uudised</text>
-  <text id="events">Tulevased sündmused</text>
-  <text id="morenews">Rohkem uudiseil…</text>
-  <text id="moreevents">Rohkem sündmuseid…</text>
-
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
diff --git a/index.fi.xhtml b/index.fi.xhtml
index ad122bf3d8..6c3a047483 100644
--- a/index.fi.xhtml
+++ b/index.fi.xhtml
@@ -36,10 +36,7 @@
     </p>
   </body>
 
-  <text id="news">Uusimmat uutiset</text>
-  <text id="events">Tulevat tapahtumat</text>
-  <text id="morenews">Lisää uutisia…</text>
-  <text id="moreevents">Lisää tapahtumia…</text>
+
 
   <translator>Solarius, Timo Jyrinki</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.fr.xhtml b/index.fr.xhtml
index 298b0cd6de..524d2bcd6d 100644
--- a/index.fr.xhtml
+++ b/index.fr.xhtml
@@ -36,10 +36,7 @@
     </p>
   </body>
 
-  <text id="news">Dernières nouvelles</text>
-  <text id="events">Prochains évènements</text>
-  <text id="morenews">Autres nouvelles…</text>
-  <text id="moreevents">Autres évènements…</text>
+
 
   <translator>Michel Roche (Vercors - France), Jil Larner (Mont Blanc, France)</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.hr.xhtml b/index.hr.xhtml
index 3142c1b4e6..e5f584c941 100644
--- a/index.hr.xhtml
+++ b/index.hr.xhtml
@@ -31,10 +31,7 @@
     </p>
   </body>
 
-  <text id="news">Najnovije vijesti</text>
-  <text id="events">Nadolazeći događaji</text>
-  <text id="morenews">Više vijesti…</text>
-  <text id="moreevents">Više događaja…</text>
+
 
   <translator>paxcoder</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.hu.xhtml b/index.hu.xhtml
index fa5a359359..32a918df87 100644
--- a/index.hu.xhtml
+++ b/index.hu.xhtml
@@ -31,10 +31,7 @@
     </p>
   </body>
 
-  <text id="news">Legfrissebb hírek</text>
-  <text id="events">A közeljövő eseményei</text>
-  <text id="morenews">További hírek…</text>
-  <text id="moreevents">További események…</text>
+
 
   <translator>FSF.hu Alapítvány</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.it.xhtml b/index.it.xhtml
index 048ed8cea1..d3522b186e 100644
--- a/index.it.xhtml
+++ b/index.it.xhtml
@@ -31,10 +31,7 @@
     </p>
   </body>
 
-  <text id="news">Ultime notizie</text>
-  <text id="events">Prossimi eventi</text>
-  <text id="morenews">Altre notizie…</text>
-  <text id="moreevents">Altri eventi…</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>
diff --git a/index.ku.xhtml b/index.ku.xhtml
index cacbc6685f..d981e8b01c 100644
--- a/index.ku.xhtml
+++ b/index.ku.xhtml
@@ -2,11 +2,11 @@
 
 <html> 
   <head> 
-    <title>FSF Ewr�p� - Free Software Foundation Ewr�p�</title> 
+    <title>FSF Ewrûpâ - Free Software Foundation Ewrûpâ</title> 
   </head>
   <body> 
-    <h1 class="centre">Free Software Foundation Ewr�p�</h1>
-    <p class="tagline">"Az�d wek n�v az�d�"</p>
+    <h1 class="centre">Free Software Foundation Ewrûpâ</h1>
+    <p class="tagline">"Azâd wek nâv azâdî"</p>
 
     <!--
 
@@ -27,11 +27,6 @@
     </p>
   </body>
 
-  <text id="news">N��ey�n n�</text>
-  <text id="events">N��ey�n hat�</text>
-  <text id="morenews">N��ey�n d�n�</text>
-  <text id="moreevents">N��ey�n Z�de�</text>
-
   <translator>Abdullah Ulas</translator>
   <timestamp>$Date$ $Author$</timestamp>
 </html>
diff --git a/index.mk.xhtml b/index.mk.xhtml
index 1a39402c66..d9e55e62b6 100644
--- a/index.mk.xhtml
+++ b/index.mk.xhtml
@@ -31,11 +31,7 @@
     </p>
   </body>
 
-  <text id="news">Вести</text>
-  <text id="events">Настани</text>
-  <text id="more">Прочитај повеќе...</text>
-  <text id="morenews">Повеќе вести...</text>
-  <text id="moreevents">Повеќе настани...</text>
+
   
   <translator>Igor Stamatovski (Free Software Macedonia)</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.nb.xhtml b/index.nb.xhtml
index f89efc1811..5a82773d0f 100644
--- a/index.nb.xhtml
+++ b/index.nb.xhtml
@@ -31,10 +31,7 @@
     </p>
   </body>
 
-	<text id="news">Siste nytt</text>
-	<text id="events">Hva skjer?</text>
-	<text id="morenews">Flere nyheter…</text>
-	<text id="moreevents">Flere begivenheter…</text>
+
  <translator>Andreas Tolf Tolfsen</translator>
  <timestamp>$Date$ $Author$</timestamp>
 
diff --git a/index.nl.xhtml b/index.nl.xhtml
index 8f21ead5ae..4092b3246b 100644
--- a/index.nl.xhtml
+++ b/index.nl.xhtml
@@ -36,10 +36,7 @@
     </p>
   </body>
 
-  <text id="news">Laatste nieuws</text>
-  <text id="events">Aankomende evenementen</text>
-  <text id="morenews">Meer nieuws...</text>
-  <text id="moreevents">Meer evenementen...</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 
diff --git a/index.nn.xhtml b/index.nn.xhtml
index f108c097a1..a5204f315b 100644
--- a/index.nn.xhtml
+++ b/index.nn.xhtml
@@ -32,11 +32,7 @@
 
   </body>
 
-	<text id="news">Siste nytt</text>
-	<text id="events">Kva skjer?</text>
-	<text id="more">Les meir</text>
-	<text id="morenews">Fleire nyhende …</text>
-	<text id="moreevents">Fleire hendingar …</text>
+
 
 	<translator>Andreas Tolf Tolfsen</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.pl.xhtml b/index.pl.xhtml
index a59ec69928..bd4a514287 100644
--- a/index.pl.xhtml
+++ b/index.pl.xhtml
@@ -54,11 +54,7 @@
     </p>
   </body>
 
-  <text id="news">Najświeższe wiadomości</text>
-  <text id="events">Nadchodzące wydarzenia</text>
-  <text id="more">Czytaj dalej...</text>
-  <text id="morenews">Więcej wiadomości...</text>
-  <text id="moreevents">Więcej wydarzeń...</text>
+
   <translator>Marcin Olender/Paweł Madej</translator>
 </html>
 <!--
diff --git a/index.pt.xhtml b/index.pt.xhtml
index ac8b28051c..c4ccfc083c 100644
--- a/index.pt.xhtml
+++ b/index.pt.xhtml
@@ -30,11 +30,7 @@
     </p>
   </body>
 
-  <text id="news">Últimas notícias</text>
-  <text id="events">Próximos eventos</text>
-  <text id="more">Ler mais...</text>
-  <text id="morenews">Mais notícias...</text>
-  <text id="moreevents">Mais eventos...</text>
+
  <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
diff --git a/index.ro.xhtml b/index.ro.xhtml
index 301ce898be..a572ee4e44 100644
--- a/index.ro.xhtml
+++ b/index.ro.xhtml
@@ -22,11 +22,7 @@
     </p>
   </body>
 
-  <text id="news">Ultimele noutăţi</text>
-  <text id="events">Următoarele evenimente </text>
-  <text id="more">Citiţi mai mult...</text>
-  <text id="morenews">Mai multe ştiri...</text>
-  <text id="moreevents">Mai multe evenimente...</text>
+
   
   <translator>Adi Roiban</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.ru.xhtml b/index.ru.xhtml
index be590d742b..fc597b29ec 100644
--- a/index.ru.xhtml
+++ b/index.ru.xhtml
@@ -18,10 +18,7 @@
     </p>
   </body>
 
-  <text id="news">Последние новости</text>
-  <text id="events">Предстоящие события</text>
-  <text id="morenews">Архив новостей</text>
-  <text id="moreevents">Архив событий</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 
diff --git a/index.sk.xhtml b/index.sk.xhtml
index 5e96b37f9f..c9efe3713f 100644
--- a/index.sk.xhtml
+++ b/index.sk.xhtml
@@ -32,11 +32,7 @@
     </p>
   </body>
 
-  <text id="news">Najnovšie správy</text>
-  <text id="events">Pripravované akcie</text>
-  <text id="more">Prečítajte si viac...</text>
-  <text id="morenews">Staršie správy...</text>
-  <text id="moreevents">Ďalšie akcie...</text>
+
 
  <translator>Dominik Smatana</translator>
  <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.sl.xhtml b/index.sl.xhtml
index 14976cb169..c783dd4e5a 100644
--- a/index.sl.xhtml
+++ b/index.sl.xhtml
@@ -31,12 +31,6 @@
     </p>
   </body>
 
-  <text id="news">Zadnje novice</text>
-  <text id="events">Dogodki</text>
-  <text id="more">Več...</text>
-  <text id="morenews">Več novic...</text>
-  <text id="moreevents">Več dogodkov...</text>
-
  <translator>Domen Košir</translator>
  <timestamp>$Date$ $Author$</timestamp>
 
diff --git a/index.sq.xhtml b/index.sq.xhtml
index ccb5927d73..6843bec380 100644
--- a/index.sq.xhtml
+++ b/index.sq.xhtml
@@ -22,11 +22,7 @@
     </p>
   </body>
 
-  <text id="news">Lajmet e fundit</text>
-  <text id="events">Së afërmi</text>
-  <text id="more">Lexoni më tepër...</text>
-  <text id="morenews">Lajme të tjerë...</text>
-  <text id="moreevents">Ngjarje të tjera...</text>
+
   
   <translator>Besnik Bletën</translator>
   <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.sr.xhtml b/index.sr.xhtml
index 3c81a886a1..fbbada5783 100755
--- a/index.sr.xhtml
+++ b/index.sr.xhtml
@@ -27,11 +27,7 @@
     </p>
   </body>
 
-  <text id="news">Najnovije vesti</text>
-  <text id="events">Događaji koji slede</text>
-  <text id="more">Pročitajte više...</text>
-  <text id="morenews">Više vesti...</text>
-  <text id="moreevents">Više o događajima...</text>
+
 
   <timestamp>$Date$ $Author$</timestamp>
 
diff --git a/index.sv.xhtml b/index.sv.xhtml
index 9c0b808e96..c9e93764fd 100644
--- a/index.sv.xhtml
+++ b/index.sv.xhtml
@@ -32,11 +32,7 @@
     </p>
   </body>
 
-  <text id="news">Senaste nytt</text>
-  <text id="events">Kommande evenamang</text>
-  <text id="more">Läs mer...</text>
-  <text id="morenews">Fler nyheter...</text>
-  <text id="moreevents">Fler evenemang...</text>
+
   
   <!-- Add your name here /Marcus -->
   <translator>Marcus Rejås med flera</translator>
diff --git a/index.tr.xhtml b/index.tr.xhtml
index b8d4a22d90..8fffeb2895 100644
--- a/index.tr.xhtml
+++ b/index.tr.xhtml
@@ -29,11 +29,7 @@
     </p>
   </body>
 
-  <text id="news">Haberler</text>
-  <text id="events">Etkinlikler</text>
-  <text id="more">Devamı...</text>
-  <text id="morenews">Haberlerin Devamı...</text>
-  <text id="moreevents">Etkinliklerin Devamı...</text>
+
 
  <translator>Oğuzhan Öğreden</translator>
  <timestamp>$Date$ $Author$</timestamp>
diff --git a/index.xsl b/index.xsl
index b226c0a41d..b46bc052cf 100644
--- a/index.xsl
+++ b/index.xsl
@@ -7,7 +7,11 @@
   <xsl:import href="tools/xsltsl/date-time.xsl" />
   <xsl:import href="tools/xsltsl/tagging.xsl" />
   <xsl:output method="xml" encoding="UTF-8" indent="yes" />
-
+  
+  <!-- The top level element of the input file is "buildinfo" -->
+  <xsl:template match="buildinfo">
+    <xsl:apply-templates select="node()"/>
+  </xsl:template>
   
   <!--display dynamic list of news items-->
   <xsl:template match="all-news">
@@ -46,6 +50,28 @@
     </xsl:call-template>
     
   </xsl:template>
+  
+  <!--display labels-->
+  
+  <!--translated word "newsletter"-->
+  <xsl:template match="newsletter-label">
+    <xsl:apply-templates select="/buildinfo/textset/text[@id='newsletter']/node()"/>
+  </xsl:template>
+  
+  <!--translated word "news"-->
+  <xsl:template match="news-label">
+    <xsl:apply-templates select="/buildinfo/textset/text[@id='news']/node()"/>
+  </xsl:template>
+
+  <!--translated word "events"-->
+  <xsl:template match="events-label">
+    <xsl:value-of select="/buildinfo/@language" />
+  </xsl:template>
+  
+  <!--translated word "events"-->
+  <xsl:template match="more-label">
+    <xsl:apply-templates select="/buildinfo/textset/text[@id='more']/node()"/>
+  </xsl:template>
 
   <!-- Do not copy <set> to output at all -->
   <xsl:template match="set"/>