move some strings to a .def file and use gettext so homepage does not get outdated if we change them

5 files changed, 74 insertions, 17 deletions

diff --git a/english/Makefile b/english/Makefile
index eff7aef056e..04406cb52bd 100644
--- a/english/Makefile
+++ b/english/Makefile
@@ -28,12 +28,12 @@ SEARCHXML = $(sort $(foreach i,$(SUBLANG),$(subst search,search.$(LANGUAGE)-$(i)
 DESTSEARCHXML = $(patsubst %.xml,$(HTMLDIR)/%.xml,$(SEARCHXML))
 endif
 
-$(INDEXPAGE): index.wml $(TEMPLDIR)/mainpage.wml $(GETTEXTDEP) \
+$(INDEXPAGE): index.wml index.def $(TEMPLDIR)/mainpage.wml $(GETTEXTDEP) \
 		$(wildcard News/$(CUR_YEAR)/[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/[0-9]*.wml) \
 		$(wildcard News/$(CUR_YEAR)/[0-9]*.title) \
 		$(wildcard security/$(CUR_YEAR)/dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-[0-9]*.wml) \
 		$(TEMPLDIR)/ctime.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml \
-		$(TEMPLDIR)/release_info.wml $(TEMPLDIR)/release_images.wml
+		$(TEMPLDIR)/release_info.wml $(TEMPLDIR)/release_images.wml $(TEMPLDIR)/links.tags.wml
 ifeq "$(LANGUAGE)" "zh"
 	@echo -n "Processing $(<F): "
 	$(shell echo $(WML) | perl -pe 's,:.zh-(..)\.html,:index.zh-$$1.html,g') \
diff --git a/english/index.def b/english/index.def
new file mode 100644
index 00000000000..b7f902b67ca
--- /dev/null
+++ b/english/index.def
@@ -0,0 +1,44 @@
+#use wml::debian::countries
+#use wml::debian::url
+#use wml::debian::common_tags
+ 
+<bind-gettext-domain domain="homepage" /> 
+ 
+<define-tag motto whitespace=delete>
+<gettext domain="homepage">The Universal Operating System</gettext>
+</define-tag>
+
+<define-tag DC19Title whitespace=delete>
+<gettext domain="homepage">DC19 Group Photo</gettext>
+</define-tag>
+<define-tag DC19Alt whitespace=delete>
+<gettext domain="homepage">DebConf19 Group Photo</gettext>
+</define-tag>
+
+<define-tag MiniDebConfHamburgTitle whitespace=delete>
+<gettext domain="homepage">Mini DebConf Hamburg 2018</gettext>
+</define-tag>
+<define-tag MiniDebConfHamburgAlt whitespace=delete>
+<gettext domain="homepage">Group photo of the MiniDebConf in Hamburg 2018</gettext>
+</define-tag>
+
+<define-tag CalamaresTitle whitespace=delete>
+<gettext domain="homepage">Screenshot Calamares Installer</gettext>
+</define-tag>
+<define-tag CalamaresAlt whitespace=delete>
+<gettext domain="homepage">Screenshot from the Calamares installer</gettext>
+</define-tag>
+
+<define-tag SwissKnifeTitle whitespace=delete>
+<gettext domain="homepage">Debian is like a Swiss Knife</gettext>
+</define-tag>
+<define-tag SwissKnifeAlt whitespace=delete>
+<gettext domain="homepage">Debian is like a Swiss Knife</gettext>
+</define-tag>
+
+<define-tag PeopleTitle whitespace=delete>
+<gettext domain="homepage">People have fun</gettext>
+</define-tag>
+<define-tag PeopleAlt whitespace=delete>
+<gettext domain="homepage">Debian people at Debconf18 in Hsinchu really having fun</gettext>
+</define-tag>
diff --git a/english/index.wml b/english/index.wml
index fb3b228905b..2b6215bdb79 100644
--- a/english/index.wml
+++ b/english/index.wml
@@ -1,4 +1,7 @@
-#use wml::debian::mainpage title="The Universal Operating System"
+#use wml::debian::links.tags
+#include "$(ENGLISHDIR)/index.def"
+#use wml::debian::mainpage title="<motto>"
+
 
 <link href="startpage.css" rel="stylesheet" type="text/css">
 <link href="5img-carousel-slider.css" rel="stylesheet" type="text/css">
@@ -26,42 +29,42 @@
           <div class="inner">
             <article>
               <div class="info bottom-right">
-                <h3>DC19 Group Photo</h3>
+                <h3><DC19Title></h3>
               </div>
               <img src="Pics/Debconf19_group_photo.jpg"
-                   alt="Logo of DebConf19"/>
+                   alt="<DC19Alt>"/>
             </article>
 
             <article>
               <div class="info top-left">
-                <h3>Mini DebConf Hamburg 2018</h3>
+                <h3><MiniDebConfHamburgTitle></h3>
               </div>
               <img src="Pics/minidc-hh2019-group-photo-1024x576.jpg"
-                   alt="Group photo of the MiniDebConf in Hamburg 2018"/>
+                   alt="<MiniDebConfHamburgAlt>"/>
             </article>
 
             <article>
               <div class="info top-left">
-                <h3>Screenshot Calamares Installers</h3>
+                <h3><CalamaresTitle></h3>
               </div>
               <img src="Pics/calamares-debian-installer-1024x576.jpg"
-                   alt="Screenshot from the Calamares installer" />
+                   alt="<CalamaresAlt>" />
             </article>
 
             <article>
               <div class="info top-left">
-                <h3>Debian is like a Swiss Knife</h3>
+                <h3><SwissKnifeTitle></h3>
               </div>
               <img src="Pics/debian-swiss-knife-hands-1024x576.jpg"
-                   alt="Debian is like a Swiss Knife" />
+                   alt="<SwissKnifeAlt>" />
             </article>
 
             <article>
               <div class="info top-left">
-                <h3>People have fun</h3>
+                <h3><PeopleTitle></h3>
               </div>
               <img src="Pics/debian-funny-people-1024x576.jpg"
-                   alt="Debian people at Debconf18 in Hsinchu really having fun"/>
+                   alt="<PeopleAlt>"/>
             </article>
           </div>  <!-- .inner -->
         </div>  <!-- .slider-wrapper -->
@@ -131,7 +134,7 @@
       <h2>Debian is a complete Free Operating System!</h2>
       <div class="os-img-container">
         <img src="Pics/debian-logo-1024x576.png" alt="Debian">
-        <a href="<stable-images-url/>/amd64/iso-cd/debian-<current-tiny-cd-release-filename/>-amd64-netinst.iso" class="os-dl-btn">Download</a>
+        <a href="<stable-images-url/>/amd64/iso-cd/debian-<current-tiny-cd-release-filename/>-amd64-netinst.iso" class="os-dl-btn"><download></a>
       </div>
     </div>
     <div class="row">
@@ -158,7 +161,7 @@
       </div>
       <div class="styled-href-blue column-4-parts">
         <h2><a href="security/">Security Updates</a></h2>
-        <p>Debian Security Announcements (DSA) <a class="rss_logo" href="security/dsa">RSS</a></p>
+        <p>Debian Security Advisories (DSA) <a class="rss_logo" href="security/dsa">RSS</a></p>
       </div>
     </div>
     <div class="row">
@@ -180,7 +183,7 @@
 <div class="row">
   <div class="column styled-href-blue column-left">
     <div align="center">
-      <h1>Project News</h1>
+      <h1><projectnews></h1>
       <h2>News and Announcements about Debian!</h2>
     </div>
     <!-- First, most recent News entry. -->
diff --git a/english/po/Makefile b/english/po/Makefile
index 94d92dfbbb2..f7b642858e7 100644
--- a/english/po/Makefile
+++ b/english/po/Makefile
@@ -9,7 +9,7 @@ include $(WMLBASE)/Make.lang
 LOCALEROOT = $(WMLBASE)/../locale
 
 DOMAINS = templates bugs blends cdimage consultants countries date distrib \
-	  doc l10n langs legal mailinglists newsevents organization \
+	  doc homepage l10n langs legal mailinglists newsevents organization \
 	  partners ports security stats vendors vote wnpp others
 
 bugs_FILES      = $(ENGLISHDIR)/Bugs/pkgreport-opts.inc
@@ -27,6 +27,7 @@ distrib_FILES	= $(ENGLISHDIR)/distrib/search_packages-form.inc \
   $(ENGLISHDIR)/releases/arches.data
 doc_FILES       = $(ENGLISHDIR)/doc/books.def $(ENGLISHDIR)/doc/manuals.defs \
 		  $(ENGLISHDIR)/doc/books.data $(ENGLISHDIR)/releases/arches.data
+homepage_FILES      = $(ENGLISHDIR)/index.def \
 l10n_FILES      = $(ENGLISHDIR)/international/l10n/dtc.def \
   $(ENGLISHDIR)/international/l10n/menu.def
 langs_FILES     = $(TEMPLDIR)/language_names.wml
@@ -83,6 +84,7 @@ SOURCEFILES = \
   $(date_FILES)                 \
   $(distrib_FILES)              \
   $(doc_FILES)                  \
+  $(homepage_FILES)             \
   $(l10n_FILES)                 \
   $(langs_FILES)                \
   $(legal_FILES)                \
@@ -131,6 +133,9 @@ $(ENGLISHDIR)/po/doc.pot: # $(doc_FILES)
 $(ENGLISHDIR)/po/l10n.pot: # $(l10n_FILES)
 	$(ENGLISHDIR)/po/wmlxgettext.pl l10n $(l10n_FILES) > $@
 
+$(ENGLISHDIR)/po/homepage.pot: # $(l10n_FILES)
+	$(ENGLISHDIR)/po/wmlxgettext.pl homepage $(l10n_FILES) > $@
+
 $(ENGLISHDIR)/po/langs.pot: # $(langs_FILES)
 	$(ENGLISHDIR)/po/wmlxgettext.pl langs $(langs_FILES) > $@
 
diff --git a/english/po/homepage.pot b/english/po/homepage.pot
new file mode 100644
index 00000000000..3d77364843d
--- /dev/null
+++ b/english/po/homepage.pot
@@ -0,0 +1,5 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+