[Blends-commit] [SCM] website branch, master, updated. 5ad10b956b2239cbf6f7375a49c90ac8dd3108c4

[Ole Streicher]

The following commit has been merged in the master branch:
commit 87bf4911fa5e883842d394dce8a5a19af69d761c
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Jan 10 20:46:12 2016 +0100

    Correct argument(s) of str.format()

diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 0f180a0..8181029 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -98,10 +98,9 @@ for lang in languages:
     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 %s
+    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:%s">%s mailing list</a>""") % \
-                                  (data['projectname'], data['projectlist'], data['projectname']))
+                              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'
@@ -112,7 +111,7 @@ for lang in languages:
     data['packages']           = 'Packages'
     data['gtstrTasksPage']     = 'Tasks page'
     data['gtstrProject']	   = 'Project'
-    data['gtstrThisIsAList']   = 'This is a list of the Tasks %s is made of:' % data['projectname']
+    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)))
@@ -134,14 +133,10 @@ for lang in languages:
         data['projectadvertising'] = None
 
     data['packages']          = 'Packages'
-    data['idxsummary']        = ("""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']        = '''The {0} Pure Blend contains {1} packages which
+    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 {0}'''.format(data['projectname'], len(data['PackageByName']))
+    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

-- 
Static and dynamic websites for Debian Pure Blends