From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 13 Oct 2007 22:10:23 +0000 (+0200)
Subject: Make config templates translatable
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=41c1e4b1142292ea58d6dd9ecbd2d4b978baede0;p=deb%2Fpackages.git

Make config templates translatable

While I'm on it, also remove some Debian hardcoding where possible.
---

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 6fb12e0..bb124e7 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -29,19 +29,23 @@
    license = {
 	url => homepage _ 'license'
    }
+   trademark = {
+	name => copyright.name,
+	url => homepage _ 'trademark'
+   }
    contact = {
-	name => 'Debian Web Mailinglist',
+	name => g('Debian Web Mailinglist'),
 	mail => 'debian-www@lists.debian.org',
         url => homepage _ 'contact',
    }
    admin = {
-	name => 'Debian Webmaster',
+	name => g('%s Webmaster', organisation),
 	mail => 'webmaster@debian.org',
    }
-   trademarknotes = organisation _ ' is a trademark of ' _ copyright.name
+   trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
 -%]
 [%-
    # possible values for importance: high, normal, low
    sitewidemsg = { importance => "high",
-		   txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
+		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 -%]
diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 1eda3bb..41434a3 100644
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -1,22 +1,22 @@
 [%
 # list of architectures
 architectures = {
-        i386    => 'Intel x86',
-        m68k    => 'Motorola 680x0',
-        sparc   => 'SPARC',
-        alpha   => 'Alpha',
-        powerpc => 'PowerPC',
-        arm     => 'ARM',
-        hppa    => 'HP PA-RISC',
-        ia64    => 'Intel IA-64',
-        mips    => 'MIPS (big-endian)',
-        mipsel  => 'MIPS (little-endian)',
-        s390    => 'IBM S/390',
-	"hurd-i386" => 'Hurd (i386)',
-	amd64   => 'AMD64',
-	armel   => 'EABI ARM',
-	"kfreebsd-i386" => 'GNU/kFreeBSD (i386)',
-	"kfreebsd-amd64" => 'GNU/kFreeBSD (amd64)'
+        i386    => g('Intel x86'),
+        m68k    => g('Motorola 680x0'),
+        sparc   => g('SPARC'),
+        alpha   => g('Alpha'),
+        powerpc => g('PowerPC'),
+        arm     => g('ARM'),
+        hppa    => g('HP PA-RISC'),
+        ia64    => g('Intel IA-64'),
+        mips    => g('MIPS (big-endian)'),
+        mipsel  => g('MIPS (little-endian)'),
+        s390    => g('IBM S/390'),
+	"hurd-i386" => g('Hurd (i386)'),
+	amd64   => g('AMD64'),
+	armel   => g('EABI ARM'),
+	"kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
+	"kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
 }
 
 %]
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a23ec99..0d77561 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -179,12 +179,12 @@ mirrors = {
 ports_url = 'http://www.debian.org/ports/'
 
 continents = {
-		north_america => 'North America',
-		south_america => 'South America',
-		asia          => 'Asia',
-		australia     => 'Australia and New Zealand',
-		europa        => 'Europa',
-		africa        => 'Africa',
+		north_america => g('North America'),
+		south_america => g('South America'),
+		asia          => g('Asia'),
+		australia     => g('Australia and New Zealand'),
+		europa        => g('Europe'),
+		africa        => g('Africa'),
 	}
 
 %]