fix slug for feed urls

Conflicts:

	pelican/contents.py
This commit is contained in:
tehkonst 2012-11-27 16:06:55 +04:00 committed by Alexis Métaireau
commit ab035795bc
2 changed files with 12 additions and 12 deletions

View file

@ -213,11 +213,11 @@ class ArticlesGenerator(Generator):
arts.sort(key=attrgetter('date'), reverse=True)
if self.settings.get('CATEGORY_FEED_ATOM'):
writer.write_feed(arts, self.context,
self.settings['CATEGORY_FEED_ATOM'] % cat)
self.settings['CATEGORY_FEED_ATOM'] % cat.slug)
if self.settings.get('CATEGORY_FEED_RSS'):
writer.write_feed(arts, self.context,
self.settings['CATEGORY_FEED_RSS'] % cat,
self.settings['CATEGORY_FEED_RSS'] % cat.slug,
feed_type='rss')
if (self.settings.get('TAG_FEED_ATOM')
@ -226,11 +226,11 @@ class ArticlesGenerator(Generator):
arts.sort(key=attrgetter('date'), reverse=True)
if self.settings.get('TAG_FEED_ATOM'):
writer.write_feed(arts, self.context,
self.settings['TAG_FEED_ATOM'] % tag)
self.settings['TAG_FEED_ATOM'] % tag.slug)
if self.settings.get('TAG_FEED_RSS'):
writer.write_feed(arts, self.context,
self.settings['TAG_FEED_RSS'] % tag,
self.settings['TAG_FEED_RSS'] % tag.slug,
feed_type='rss')
if (self.settings.get('TRANSLATION_FEED_ATOM')