branch merge

Conflicts:
	pelican/generators.py
	pelican/settings.py
This commit is contained in:
Alexis Metaireau 2011-01-05 18:25:14 +01:00
commit 2f915caff2
21 changed files with 184 additions and 54 deletions

View file

@ -148,6 +148,7 @@ def process_translations(content_list):
Also, for each content_list item, it
sets attribute 'translations'
"""
content_list.sort(key=attrgetter('slug'))
grouped_by_slugs = groupby(content_list, attrgetter('slug'))
index = []
translations = []