The following commit has been merged in the master branch:
commit 58b347eab8ae054cc759eade81274a4d67d3e444
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Nov 28 12:47:42 2015 +0100
I18n for new task index
diff --git a/webtools/tasks.py b/webtools/tasks.py
index adcd938..fde73c5 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -90,16 +90,23 @@ for lang in languages:
data['lang'] = lang
data['license'] = to_unicode(_('License'))
data['version'] = to_unicode(_('Version'))
- data['summary'] = to_unicode(_('Summary'))
+ data['summary'] = to_unicode(_('Summary'))
data['updatetimestamp'] = to_unicode(_('Last update:')) + ' ' +
formatdate(time.mktime(t.timetuple()))
- data['nopkgavail'] = to_unicode(_('Debian package not
available'))
+ data['nopkgavail'] = to_unicode(_('Debian package not
available'))
# Description of package in specific packges (same for Depends,
Recommends, Suggests)
- data['legend'] = to_unicode(_("For a better overview of the
project's availability as a Debian package, each head row has a color code
according to this scheme:"))
- data['discovery'] = Markup(to_unicode(_("""If you discover a
project which looks like a good candidate for %s
- to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
- send a description of that project to the <a
href="mailto:%s";>%s mailing list</a>""") % \
- (data['projectname'], data['projectlist'],
data['projectname'])))
- data['description'] = to_unicode(_("The list to the right
includes various software projects which are of some interest to the %s
Project. Currently, only a few of them are available as Debian packages. It is
our goal, however, to include all software in %s which can sensibly add to a
high quality Debian Pure Blend.") % (data['projectname'], data['projectname']))
+ data['legend'] = to_unicode(_("For a better overview of the
project's availability as a Debian package, each head row has a color code
according to this scheme:"))
+ data['discovery'] = Markup(to_unicode(_("""If you discover a
project which looks like a good candidate for %s
+ to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
+ send a description of that project to the <a
href="mailto:%s";>%s mailing list</a>""") % \
+ (data['projectname'],
data['projectlist'], data['projectname'])))
+ data['bugs'] = to_unicode(_('Bugs'))
+ data['thermometer'] = to_unicode(_('Thermometer'))
+ data['maintstats'] = to_unicode(_('Maintainer Stats'))
+ data['contact'] = to_unicode(_('Contact'))
+ data['contribute'] = to_unicode(_('Contribute'))
+ data['description'] = to_unicode(_('Description'))
+ data['metapackage'] = to_unicode(_('Metapackage'))
+ data['packages'] = to_unicode(_('Packages'))
data['gtstrTasksPage'] = to_unicode(_('Tasks page'))
data['gtstrProject'] = to_unicode(_('Project'))
data['gtstrThisIsAList'] = to_unicode(_('This is a list of the Tasks
%s is made of:') % data['projectname'])
@@ -112,6 +119,10 @@ for lang in languages:
data['popconexplanation'] = to_unicode(_('Popularitycontest results:
number of people who use this package regularly (number of people who upgraded
this package recently) out of'))
data['tableofcontents'] = to_unicode(_('Table of contents'))
data['packagelist'] = to_unicode(_('complete packagelist'))
+ data['tasksintro'] = to_unicode(_('''The packages of the {0}
+ Pure Blend are grouped by metapackages. Each metapackage will cause
the
+ installation of packages for a specific topic. The following table
lists
+ the metapackages of {0}''').format((data['projectname'])))
if data['advertising'] != None:
# If data['advertising'] is enclosed in _() gettext tries to
ask for translations of 'advertising'
# which makes no sense. That's why this is masked by an extra
string variable
@@ -123,11 +134,11 @@ for lang in languages:
else:
data['projectadvertising'] = None
- data['packages'] = to_unicode(_('Packages'))
+ data['packages'] = to_unicode(_('Packages'))
data['idxsummary'] = to_unicode(_("""A %sDebian Pure Blend%s is
a Debian internal project which assembles
a set of packages that might help users to solve certain tasks of their work.
The list on
the right shows the tasks of %s.""" ) \
- % ('<a
href="http://blends.alioth.debian.org/blends/";>', '</a>', data['projectname']))
+ % ('<a
href="http://blends.alioth.debian.org/blends/";>', '</a>', data['projectname']))
data['idxsummary'] = Markup(to_unicode(data['idxsummary']))
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index 541db4d..b36693f 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -29,18 +29,18 @@
<span py:when="projectname == 'Debian Astro'">
<ul>
<li><a href="$projecturl">$projectname</a></li>
- <li><a href="../tasks">Packages</a></li>
- <li><a href="../contact.html">Contact</a></li>
- <li><a href="../contribute.html">Contribute</a></li>
+ <li><a href="../tasks">$packages</a></li>
+ <li><a href="../contact.html">$contact</a></li>
+ <li><a href="../contribute.html">$contribute</a></li>
</ul>
</span>
<span py:otherwise="">
<ul>
<li><a href="$projecturl">$projectname</a></li>
- <li><a href="../tasks">Tasks</a></li>
- <li><a href="../bugs/">Bugs</a></li>
- <li><a href="../thermometer/">Thermometer</a></li>
- <li><a href="../maintstats/">Maintainer Stats</a></li>
+ <li><a href="../tasks">$packages</a></li>
+ <li><a href="../bugs/">$bugs</a></li>
+ <li><a href="../thermometer/">$thermometer</a></li>
+ <li><a href="../maintstats/">$maintstats</a></li>
</ul>
</span>
</span>
@@ -48,19 +48,17 @@
<p id="breadcrumbs">
<a href="http://blends.debian.org";>Debian Pure Blends</a>
/ <a href="$projecturl">$projectname</a>
- / Packages
+ / $packages
</p>
</div><!-- end header -->
<div id="content">
- <h1>$projectname Packages</h1>
- <p> The packages of the $projectname Pure Blend are grouped by
- metapackages. Each metapackage will cause the installation of
- packages for a specific topic. The following table lists the
- metapackages of $projectname:
+ <h1>$projectname $packages</h1>
+ <p>
+ $tasksintro:
</p>
<table>
<thead>
- <tr><th>Metapackage</th><th>Description</th></tr>
+ <tr><th>$metapackage</th><th>$description</th></tr>
</thead>
<tbody>
<py:for each="task in taskskeys">
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
