The following commit has been merged in the master branch:
commit 1b6ccec7d2747f021d40cac2a64b375a909fed17
Author: Ole Streicher <[email protected]>
Date: Mon Jan 11 17:29:07 2016 +0100
Remove i18n from .py source since genshi may handle this by itself
diff --git a/webtools_py3/bugs.py b/webtools_py3/bugs.py
index 254f499..892640d 100755
--- a/webtools_py3/bugs.py
+++ b/webtools_py3/bugs.py
@@ -325,7 +325,7 @@ the right shows the tasks of %s.""" ) \
data['bugssummary'] = Markup(data['bugssummary'])
data['gtstrBugsPage'] = _("Bugs page")
data['gtstrListOfBugspages'] = _("This is a list of metapackages. The
links are leading to the respective bugs page.")
- data['updatetimestamp'] = _('Last update:') + ' ' +
formatdate(time.mktime(t.timetuple()))
+ data['timestamp'] = formatdate(time.mktime(t.timetuple()))
data['weightexplanation'] = _("""To estimate the overall status of the
packages in the dependencies of
a metapackage a weighted severity is calculated. Done bugs are ignored
and bugs in dependent and
recommended packages are weighted by factor three compared to suggested
packages. Release critical
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 3b65707..0cf2553 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -37,9 +37,11 @@ tasks.MarkupPreformatedStringsBlend()
data = tasks.data
# print("data : \n",data)
+data['timestamp'] = formatdate(time.mktime(datetime.now().timetuple()))
data['tasks'] = tasks.GetTaskDescDict()
data['taskskeys'] = tasks.metapackagekeys
data['PackageByName'] = tasks.PackageByName
+data['pkgcount'] = len(data['PackageByName'])
try:
data['popconsubmit'] = tasks.popconsubmit
except:
@@ -59,22 +61,20 @@ domain = 'blends-webtools'
gettext.install(domain)
l10nstring = {}
for lang in languages:
- l10nstring[lang] = gettext.translation(domain, locale_dir,
languages=[lang], fallback = True)
+ l10nstring[lang] = gettext.translation(domain, locale_dir,
languages=[lang], fallback = True)
# Translated strings regarding the categorising of dependencies need to
# be translated and because I did not found a working solution to get
# gettext working with genshi all are collected here even if the additional
# attributes to blendstasktools.pkgstatus rather should go blendstasktools.py
-
# initialize gensi
loader = TemplateLoader([template_dir], auto_reload=True)
outputdir = CheckOrCreateOutputDir(tasks.data['outputdir'],'tasks_udd')
if outputdir == None:
- exit(-1)
+ exit(-1)
-t = datetime.now()
htaccess = os.path.join(outputdir, 'htaccess')
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
@@ -88,59 +88,24 @@ for lang in languages:
l10nstring[lang].install()
# _ = l10nstring[lang].ugettext
data['lang'] = lang
- data['license'] = 'License'
- data['version'] = 'Version'
- data['summary'] = 'Summary'
- data['updatetimestamp'] = 'Last update:' + ' ' +
formatdate(time.mktime(t.timetuple()))
- data['nopkgavail'] = 'Debian package not available'
# Description of package in specific packges (same for Depends,
Recommends, Suggests)
- data['legend'] = "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(("""If you discover a project which
looks like a good candidate for {projectname}
- 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:{projectlist}";>{projectname} mailing list</a>""".format(**data)))
- data['bugs'] = 'Bugs'
- data['thermometer'] = 'Thermometer'
- data['maintstats'] = 'Maintainer Stats'
- data['contact'] = 'Contact'
- data['contribute'] = 'Contribute'
- data['description'] = 'Description'
- data['metapackage'] = 'Metapackage'
- data['packages'] = 'Packages'
- data['gtstrTasksPage'] = 'Tasks page'
- data['gtstrProject'] = 'Project'
- data['gtstrThisIsAList'] = 'This is a list of the Tasks {projectname} is
made of:'.format(**data)
- data['langavail'] = 'This page is also available in the following
languages:'
- data['howtosetlang'] = 'How to set <a href="%s">the default document
language</a>'
- data['howtosetlang'] = Markup((data['howtosetlang'] %
('http://www.debian.org/intro/cn.%s.html' % lang)))
- data['nohomepage'] = 'Homepage not available'
- data['translatedesc'] = 'Translate description'
- data['fixtranslation'] = 'Fix translated description'
- data['popconexplanation'] = 'Popularitycontest results: number of people
who use this package regularly (number of people who upgraded this package
recently) out of'
- data['tableofcontents'] = 'Table of contents'
- data['packagelist'] = 'complete packagelist'
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
- advertising = data['advertising']
- # data['projectadvertising'] = _(advertising) # Hopefully
translation will work this way ...
- # Genshi needs explicite information that it is dealing with an
UTF-8 string which should not be changed
+ # 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
+ advertising = data['advertising']
+ # data['projectadvertising'] = _(advertising) # Hopefully translation
will work this way ...
+ # Genshi needs explicite information that it is dealing with an UTF-8
string which should not be changed
# advertising = _(advertising)
- data['projectadvertising'] = Markup((advertising))
+ data['projectadvertising'] = Markup((advertising))
else:
data['projectadvertising'] = None
- data['packages'] = 'Packages'
- data['idxsummary'] = '''The {projectname} Pure Blend contains
{count} packages which
- are grouped by metapackages. Each metapackage will cause the
- installation of packages for a specific topic. The following table lists
- the metapackages of
{projectname}'''.format(count=len(data['PackageByName']), **data)
-
- pkgstatus['official_high']['headline'] = 'Official Debian packages with
high relevance'
# before fiddling around with unicode() read
#
http://www.red-mercury.com/blog/eclectic-tech/python-unicode-fixing-utf-8-encoded-as-latin-1-iso-8859-1/
+ pkgstatus['official_high']['headline'] = 'Official Debian packages with
high relevance'
pkgstatus['official_high']['pdolinkname'] = 'Official Debian package'
pkgstatus['official_low'] ['headline'] = 'Official Debian packages with
lower relevance'
- pkgstatus['official_low'] ['pdolinkname'] =
pkgstatus['official_high']['pdolinkname']
+ pkgstatus['official_low'] ['pdolinkname'] = 'Official Debian package'
pkgstatus['non-free'] ['headline'] = 'Debian packages in contrib or
non-free'
pkgstatus['non-free'] ['pdolinkname'] = 'Debian package in
contrib/non-free'
pkgstatus['experimental'] ['headline'] = 'Debian packages in
experimental'
@@ -150,11 +115,11 @@ for lang in languages:
pkgstatus['pkgvcs'] ['headline'] = 'Packaging has started and
developers might try the packaging code in VCS'
pkgstatus['pkgvcs'] ['pdolinkname'] = 'Unofficial Debian package'
pkgstatus['unofficial'] ['headline'] = 'Unofficial packages built by
somebody else'
- pkgstatus['unofficial'] ['pdolinkname'] =
pkgstatus['pkgvcs']['pdolinkname']
+ pkgstatus['unofficial'] ['pdolinkname'] = 'Unofficial Debian package'
pkgstatus['prospective'] ['headline'] = 'No known packages available'
pkgstatus['prospective'] ['pdolinkname'] = 'Debian package not available'
pkgstatus['wnpp'] ['headline'] = 'No known packages available
but some record of interest (WNPP bug)'
- pkgstatus['wnpp'] ['pdolinkname'] =
pkgstatus['prospective']['pdolinkname']
+ pkgstatus['wnpp'] ['pdolinkname'] = 'Debian package not available'
# Ignore/Avoid is only relevant for blends-dev, not webtools
pkgstatus['ignore'] ['headline'] = 'Should not show up here'
pkgstatus['prospective'] ['pdolinkname'] = ''
@@ -193,7 +158,6 @@ for lang in languages:
stderr.write("Some critical encoding problem occured when
trying"
+ " to render index for lang {0}.\n{1}\n"
.format(lang, str(err)))
-
SetFilePermissions(outputfile)
except:
pass
@@ -232,8 +196,6 @@ for lang in languages:
# Keep the Project lists per task to be able to loop over all tasks in
plain package list
data['projects'][task] = tasks.tasks[task].dependencies
- data['othertasks'] = ("Links to other tasks")
- data['indexlink'] = ("Index of all tasks")
if data['projectname'] == 'Debian Astro':
template = loader.load('packages.xhtml')
diff --git a/webtools_py3/templates/bugs.xhtml
b/webtools_py3/templates/bugs.xhtml
index 6caa604..a16b922 100644
--- a/webtools_py3/templates/bugs.xhtml
+++ b/webtools_py3/templates/bugs.xhtml
@@ -149,7 +149,7 @@
</tr>
</table>
<div class="footnote">
- <address>${updatetimestamp}</address>
+ <address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/debian-astro_idx.xhtml
b/webtools_py3/templates/debian-astro_idx.xhtml
index 54c5bce..948933b 100644
--- a/webtools_py3/templates/debian-astro_idx.xhtml
+++ b/webtools_py3/templates/debian-astro_idx.xhtml
@@ -23,9 +23,9 @@
<div id="navbar">
<ul>
<li><a href="index.html">$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>
</div>
<p id="breadcrumbs">
@@ -48,31 +48,31 @@
<h2>Featured packages</h2>
<py:for each="fp_row in [['stellarium', 'glueviz'], ['saods9',
'splash']]">
<div class="line">
- <py:for each="pkg_name in fp_row">
- <div class="col50">
- <table>
- <tr>
- <td style="border-top-style: none;
width:150px;">
- <img src="${PackageByName[pkg_name].icon}"
alt="" style="width:150px;" />
- </td>
- <td style="vertical-align:top;
border-top-style: none;">
- <p style="margin-bottom:0;">
-
<strong>${PackageByName[pkg_name].pkg.capitalize()}:</strong>
- <span py:choose="">
- <span
py:when="PackageByName[pkg_name].desc.has_key(lang)">${PackageByName[pkg_name].desc[lang]['short']}</span>
- <span
py:otherwise="">${PackageByName[pkg_name].desc['en']['short']}</span>
- </span>
-
- </p>
- <p style="margin-bottom:0;">
- <a
href="${PackageByName[pkg_name].properties['homepage']}">Home page</a>
- - <a
href="tasks/${PackageByName[pkg_name].taskname}#${PackageByName[pkg_name].pkg}">More...</a>
- </p>
- </td>
- </tr>
- </table>
- </div>
- </py:for>
+ <py:for each="pkg_name in fp_row">
+ <div class="col50">
+ <table>
+ <tr>
+ <td style="border-top-style: none; width:150px;">
+ <img src="${PackageByName[pkg_name].icon}" alt=""
style="width:150px;" />
+ </td>
+ <td style="vertical-align:top; border-top-style: none;">
+ <p style="margin-bottom:0;">
+
<strong>${PackageByName[pkg_name].pkg.capitalize()}:</strong>
+ <span py:choose="">
+ <span
py:when="PackageByName[pkg_name].desc.has_key(lang)">${PackageByName[pkg_name].desc[lang]['short']}</span>
+ <span
py:otherwise="">${PackageByName[pkg_name].desc['en']['short']}</span>
+ </span>
+
+ </p>
+ <p style="margin-bottom:0;">
+ <a
href="${PackageByName[pkg_name].properties['homepage']}">Home page</a>
+ - <a
href="tasks/${PackageByName[pkg_name].taskname}#${PackageByName[pkg_name].pkg}">More...</a>
+ </p>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </py:for>
</div>
</py:for>
@@ -100,14 +100,19 @@
</div>
<div id="footer">
<hr class="hidecss" />
- <p>${langavail}</p>
+ <p>This page is also available in the following languages:</p>
<py:for each="l in languages">
<span py:if="lang != l" class="navpara">
<a href="index.${language_dict[l]['short']}.html"
title="${language_dict[l]['title']}" hreflang="${language_dict[l]['htaccess']}"
lang="${language_dict[l]['htaccess']}"
rel="alternate">${language_dict[l]['printed']}</a>
</span>
</py:for>
- <p>${howtosetlang}</p>
- <address>${updatetimestamp}</address>
+ <p>
+ How to set
+ <a href="http://www.debian.org/intro/cn.${lang}.html";>
+ the default document language
+ </a>
+ </p>
+ <address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/packagelist.xhtml
b/webtools_py3/templates/packagelist.xhtml
index c42f9f0..d184ebc 100644
--- a/webtools_py3/templates/packagelist.xhtml
+++ b/webtools_py3/templates/packagelist.xhtml
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="${lang}" lang="${lang}"
xmlns:py="http://genshi.edgewall.org/";>
<head>
-<title>$projectname $packagelist</title>
+<title>$projectname complete packagelist</title>
<meta http-equiv="Content-Type" content="application/xhtml+xml;
charset=UTF-8"/>
<link href="/css/sentinel.css" type="text/css" rel="stylesheet"/>
</head>
@@ -22,18 +22,20 @@
<table class="columns">
<tr>
<td class="left">
- <span class="section">$summary</span>
+ <span class="section">Summary</span>
<div class="section">
<div class="sectionTop"></div>
- <div class="row">${idxsummary}</div>
+ <div class="row"> The ${projectname} Pure Blend contains
${pkgcount} packages
+ which are grouped by metapackages. Each metapackage will cause
+ the installation of packages for a specific topic. The
+ following table lists the packages of ${projectname}.</div>
</div>
</td>
<td class="main">
<div class="pageBody">
- <h1>$gtstrTasksPage</h1>
- <p>$gtstrThisIsAList</p>
-
- <h2>$tableofcontents</h2>
+ <h1>Tasks page</h1>
+ <p>This list of the Tasks ${projectname} is made of:</p>
+ <h2>Table of contents</h2>
<ul>
<py:for each="task in taskskeys">
<li><a
href="#${task}">${tasks[task].metapkg.PrintedName.capitalize()}</a></li>
@@ -77,14 +79,14 @@
</table>
<div id="footer">
<hr class="hidecss" />
-<p>${langavail}</p>
+<p>This page is also available in the following languages:</p>
<py:for each="l in languages">
<span py:if="lang != l" class="navpara">
<a href="packagelist.${language_dict[l]['short']}.html"
title="${language_dict[l]['title']}" hreflang="${language_dict[l]['htaccess']}"
lang="${language_dict[l]['htaccess']}"
rel="alternate">${language_dict[l]['printed']}</a>
</span>
</py:for>
-<p>${howtosetlang}</p>
- <address>${updatetimestamp}</address>
+<p>How to set <a href="http://www.debian.org/intro/cn.${lang}.html";>the
default document language</a></p>
+<address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/packages.xhtml
b/webtools_py3/templates/packages.xhtml
index 660d337..e6568a0 100644
--- a/webtools_py3/templates/packages.xhtml
+++ b/webtools_py3/templates/packages.xhtml
@@ -187,15 +187,15 @@ function show_fulldesc(hash) {
<div id="navbar">
<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>
</div>
<p id="breadcrumbs">
<a href="http://blends.debian.org";>Debian Pure Blends</a>
/ <a href="$projecturl">$projectname</a>
- / <a href="../tasks">$packages</a>
+ / <a href="../tasks">Packages</a>
/ ${tasks[task].metapkg.PrintedName.capitalize()}
</p>
</div><!-- end header -->
@@ -221,13 +221,13 @@ function show_fulldesc(hash) {
</em>
<py:choose>
<py:when test="lang in tasks[task].metapkg.desc">
- <a class="editlink" title="${fixtranslation}"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg}";
py:if="lang != 'en'">
+ <a class="editlink" title="Fix translated description"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg}";
py:if="lang != 'en'">
✏
</a>
${tasks[task].metapkg.desc[lang]['long']}
</py:when>
<py:otherwise>
- <a class="editlink" title="${translatedesc}"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg}";
py:if="lang != 'en'">
+ <a class="editlink" title="Translate description"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg}";
py:if="lang != 'en'">
✏
</a>
${tasks[task].metapkg.desc['en']['long']}
@@ -241,16 +241,6 @@ function show_fulldesc(hash) {
<a id="${pstatus}-debs" name="${pstatus}-debs"/>
${headline[pstatus]}
</h2>
-<!--
- <p>These packages are all under a
- <a href="https://www.debian.org/social_contract#guidelines";>
- DFSG-free
- </a>
- license. They are automatically selected when the
- <a href="">astro-frameworks</a>
- package is going to be installed.
- </p>
--->
</td>
</tr>
<tr class="header">
@@ -278,7 +268,7 @@ function show_fulldesc(hash) {
<td>
<py:if test="project.version">
<py:choose>
- <py:when test="isinstance(project.version[-1], (str,
unicode))">
+ <py:when test="isinstance(project.version[-1], str)">
${project.version[-1]}
</py:when>
<py:otherwise>
@@ -359,7 +349,7 @@ function show_fulldesc(hash) {
<dd>
<py:choose>
<py:when test="lang != 'en' and lang in project.desc">
- <a class="editlink" title="${fixtranslation}"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}";>
+ <a class="editlink" title="Fix translated
description"
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}";>
✏
</a>
${project.desc[lang]['long']}
@@ -431,7 +421,7 @@ function show_fulldesc(hash) {
<ul class="desc-inline">
<py:for each="version in project.version">
<py:choose>
- <py:when test="isinstance(version, (str,
unicode))">
+ <py:when test="isinstance(version, str)">
<li>${version}</li>
</py:when>
<py:when test="'amd64' in version['archs'] or
'all' in version['archs']">
@@ -586,7 +576,7 @@ function show_fulldesc(hash) {
</li>
<li py:if="lang != 'en' and lang not in project.desc">
<a
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg}";>
- ${translatedesc}
+ Translate description
</a>
</li>
</ul>
@@ -605,14 +595,19 @@ function show_fulldesc(hash) {
</div>
<div id="footer">
<hr class="hidecss" />
- <p>${langavail}</p>
+ <p>This page is also available in the following languages:</p>
<py:for each="l in languages">
<span py:if="lang != l" class="navpara">
<a href="${task}.${language_dict[l]['short']}.html"
title="${language_dict[l]['title']}" hreflang="${language_dict[l]['htaccess']}"
lang="${language_dict[l]['htaccess']}"
rel="alternate">${language_dict[l]['printed']}</a>
</span>
</py:for>
- <p>${howtosetlang}</p>
- <address>${updatetimestamp}</address>
+ <p>
+ How to set
+ <a href="http://www.debian.org/intro/cn.${lang}.html";>
+ the default document language
+ </a>
+ </p>
+ <address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/tasks.xhtml
b/webtools_py3/templates/tasks.xhtml
index 25bdd2b..3f0e83c 100644
--- a/webtools_py3/templates/tasks.xhtml
+++ b/webtools_py3/templates/tasks.xhtml
@@ -24,7 +24,7 @@
<table class="columns">
<tr>
<td class="left">
- <span class="section">${summary}</span>
+ <span class="section">Summary</span>
<div class="section">
<div class="sectionTop"/>
<div class="row">
@@ -43,23 +43,28 @@
</span></p>
</div>
<div class="row">
- <p>${description}
+ <p>Description
</p>
- <p>${legend}</p>
+ <p>For a better overview of the project's
availability as a Debian package,
+ each head row has a color code according to
this scheme:</p>
<ul>
<py:for each="pstatus in dependencies[task]">
<li class="deb-${pstatus}"><a
href="#${pstatus}-debs">${headline[pstatus]}</a></li>
</py:for>
</ul>
- <p>${discovery}</p>
+ <p>If you discover a project which looks like a
good candidate for ${projectname}
+ 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:${projectlist}";>${projectname} mailing list</a>.
+ </p>
</div>
</div>
- <span class="section">${othertasks}</span>
+ <span class="section">Links to other tasks</span>
<div class="section">
<div class="sectionTop"/>
<div class="row">
- <div class="link"><a
href="index">${indexlink}</a></div>
+ <div class="link"><a href="index">Index of all
tasks</a></div>
<py:for each="t in taskskeys">
<div py:choose="t">
<span py:when="task" class="curlink"><a
href="${t}">${tasks[t].metapkg.PrintedName.capitalize()}</a></span>
@@ -88,7 +93,7 @@
<div py:otherwise="">${project.desc['en']['short']}</div>
</div>
<div py:choose="project.properties['homepage']">
- <span py:when="'#'">${nohomepage}</span>
+ <span py:when="'#'">Homepage not available</span>
<span py:otherwise=""><a
href="${project.properties['homepage']}">${project.properties['homepage']}</a></span>
</div>
<div py:if="project.responsible != None">${maintainer[pstatus]}:
@@ -132,9 +137,9 @@
</div>
</td>
<td class="project-license">
- <em>${license}: ${project.properties['license']}</em>
+ <em>License: ${project.properties['license']}</em>
<div py:choose="project.properties['pkg-url']">
- <span py:when="'#'">${nopkgavail}</span>
+ <span py:when="'#'">Debian package not available</span>
<span py:otherwise=""><a
href="${project.properties['pkg-url']}">${pdolinkname[pstatus]}</a></span>
</div>
<div py:if="project.properties['vcs-browser'] != '#'">
@@ -145,8 +150,8 @@
</div>
<div py:if="lang != 'en' and project.component == 'main' and
project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'">
<div py:choose="">
- <div class="trans" py:when="lang in project.desc"><a
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}";>${fixtranslation}</a></div>
- <div class="trans-missing" py:otherwise=""><a
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg}";>${translatedesc}</a></div>
+ <div class="trans" py:when="lang in project.desc"><a
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg}";>Fix
translated description</a></div>
+ <div class="trans-missing" py:otherwise=""><a
href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg}";>Translate
description</a></div>
</div>
</div>
<div class="language" py:if="'language' in project.properties and
project.component != 'main'">Language: ${project.properties['language']}</div>
@@ -231,18 +236,18 @@
</tr>
</table>
<div class="footnotecontent" id="popconexplanation">
- <sup>*</sup>${popconexplanation} ${popconsubmit}
+ <sup>*</sup>Popularitycontest results: number of people who use this package
regularly (number of people who upgraded this package recently) out of
${popconsubmit}
</div>
<div id="footer">
<hr class="hidecss" />
-<p>${langavail}</p>
+<p>This page is also available in the following languages:</p>
<py:for each="l in languages">
<span py:if="lang != l" class="navpara">
<a href="${task}.${language_dict[l]['short']}.html"
title="${language_dict[l]['title']}" hreflang="${language_dict[l]['htaccess']}"
lang="${language_dict[l]['htaccess']}"
rel="alternate">${language_dict[l]['printed']}</a>
</span>
</py:for>
-<p>${howtosetlang}</p>
- <address>${updatetimestamp}</address>
+<p>How to set <a href="http://www.debian.org/intro/cn.${lang}.html";>the
default document language</a></p>
+<address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/tasks_idx.xhtml
b/webtools_py3/templates/tasks_idx.xhtml
index 5c63e98..8007084 100644
--- a/webtools_py3/templates/tasks_idx.xhtml
+++ b/webtools_py3/templates/tasks_idx.xhtml
@@ -40,18 +40,18 @@ table {
<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">$packages</a></li>
- <li><a href="../bugs/">$bugs</a></li>
- <li><a href="../thermometer/">$thermometer</a></li>
- <li><a href="../maintstats/">$maintstats</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/">Maintainer Stats</a></li>
</ul>
</span>
</span>
@@ -59,17 +59,20 @@ table {
<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>
+ <h1>$projectname Packages</h1>
<p>
- $idxsummary:
+ The ${projectname} Pure Blend contains ${pkgcount} packages
+ which are grouped by metapackages. Each metapackage will cause
+ the installation of packages for a specific topic. The
+ following table lists the metapackages of ${projectname}.
</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">
@@ -96,14 +99,19 @@ table {
</div>
<div id="footer">
<hr class="hidecss" />
- <p>${langavail}</p>
+ <p>This page is also available in the following languages:</p>
<py:for each="l in languages">
<span py:if="lang != l" class="navpara">
<a href="index.${language_dict[l]['short']}.html"
title="${language_dict[l]['title']}" hreflang="${language_dict[l]['htaccess']}"
lang="${language_dict[l]['htaccess']}"
rel="alternate">${language_dict[l]['printed']}</a>
</span>
</py:for>
- <p>${howtosetlang}</p>
- <address>${updatetimestamp}</address>
+ <p>
+ How to set
+ <a href="http://www.debian.org/intro/cn.${lang}.html";>
+ the default document language
+ </a>
+ </p>
+ <address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/templates/thermometer.xhtml
b/webtools_py3/templates/thermometer.xhtml
index 326feec..05607d9 100644
--- a/webtools_py3/templates/thermometer.xhtml
+++ b/webtools_py3/templates/thermometer.xhtml
@@ -22,10 +22,12 @@
<table class="columns">
<tr>
<td class="left">
- <span class="section">$summary</span>
+ <span class="section">Summary</span>
<div class="section">
<div class="sectionTop"/>
- <div class="row">${idxsummary}</div>
+ <div class="row">A <a
href="http://blends.alioth.debian.org/blends/";>Debian Pure Blend</a> 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
${projectname}.</div>
</div>
<span class="section">Links</span>
<div class="section">
@@ -77,7 +79,7 @@
</table>
<div id="footer">
<hr class="hidecss" />
- <address>${updatetimestamp}</address>
+ <address>Last update: ${timestamp}</address>
</div>
</body>
</html>
diff --git a/webtools_py3/thermometer.py b/webtools_py3/thermometer.py
index c39af16..9def0fe 100755
--- a/webtools_py3/thermometer.py
+++ b/webtools_py3/thermometer.py
@@ -389,16 +389,10 @@ def main():
data['latestubuntu'] = latestubuntu
data['legend'] = legend
data['ulegend'] = ulegend
- data['summary'] = to_unicode(_('Summary'))
- 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']))
- data['idxsummary'] = Markup(to_unicode(data['idxsummary']))
for key in ('homepage', 'projecturl', 'projectname', 'logourl',
'ubuntuhome', 'projectubuntu'):
data[key] = config[key]
- data['updatetimestamp'] = to_unicode(_('Last update:')) + ' ' +
formatdate(time.mktime(t.timetuple()))
+ data['timestamp'] = formatdate(time.mktime(t.timetuple()))
data['thermometer'] = blendname + '_thermometer.html'
os.system("ln -sf %s %s/index.html" % (data['thermometer'], outputdir))
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
