The following commit has been merged in the master branch: commit 54c1b987f9c6cf8d8dee21e4f9cac1503d691ef5 Author: Ole Streicher <deb...@liska.ath.cx> Date: Tue Dec 1 15:36:15 2015 +0100
Add total package count to Tasks index page diff --git a/webtools/tasks.py b/webtools/tasks.py index 80e6f1f..4f95798 100755 --- a/webtools/tasks.py +++ b/webtools/tasks.py @@ -120,10 +120,6 @@ 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 @@ -136,12 +132,10 @@ for lang in languages: data['projectadvertising'] = None 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'])) - data['idxsummary'] = Markup(to_unicode(data['idxsummary'])) - + data['idxsummary'] = to_unicode(_('''The {0} Pure Blend contains {1} 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']))) pkgstatus['official_high']['headline'] = to_unicode(_('Official Debian packages with high relevance')) # before fiddling around with unicode() read diff --git a/webtools/templates/tasks_idx.xhtml b/webtools/templates/tasks_idx.xhtml index b36693f..89fba67 100644 --- a/webtools/templates/tasks_idx.xhtml +++ b/webtools/templates/tasks_idx.xhtml @@ -54,7 +54,7 @@ <div id="content"> <h1>$projectname $packages</h1> <p> - $tasksintro: + $idxsummary: </p> <table> <thead> -- 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