github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support both old and new style string substitutions

Browse source
This commit is contained in:
MinchinWeb 2018-09-17 21:55:21 -06:00
commit 6e4a26ea82
1 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

53
pelican/generators.py
View file

@ -342,7 +342,8 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
self.settings['CATEGORY_FEED_ATOM'].replace('%s', '{slug}')
.format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_ATOM_URL',
self.settings['CATEGORY_FEED_ATOM']).format(
@ -355,7 +356,8 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
self.settings['CATEGORY_FEED_RSS'].replace('%s', '{slug}')
.format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_RSS_URL',
self.settings['CATEGORY_FEED_RSS']).format(
@ -370,12 +372,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
self.settings['AUTHOR_FEED_ATOM'].replace('%s', '{slug}')
.format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_ATOM_URL',
self.settings['AUTHOR_FEED_ATOM']).format(
slug=auth.slug
),
self.settings['AUTHOR_FEED_ATOM']
).replace('%s', '{slug}').format(slug=auth.slug),
feed_title=auth.name
)
@ -383,12 +385,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
self.settings['AUTHOR_FEED_RSS'].replace('%s', '{slug}')
.format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_RSS_URL',
self.settings['AUTHOR_FEED_RSS']).format(
slug=auth.slug
),
self.settings['AUTHOR_FEED_RSS']
).replace('%s', '{slug}').format(slug=auth.slug),
feed_title=auth.name,
feed_type='rss'
)
@ -400,7 +402,8 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_ATOM'].format(tag.slug),
self.settings['TAG_FEED_ATOM'].replace('%s', '{slug}')
.format(tag.slug),
self.settings.get(
'TAG_FEED_ATOM_URL',
self.settings['TAG_FEED_ATOM']).format(
@ -413,12 +416,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_RSS'].format(tag.slug),
self.settings['TAG_FEED_RSS'].replace('%s', '{slug}')
.format(tag.slug),
self.settings.get(
'TAG_FEED_RSS_URL',
self.settings['TAG_FEED_RSS']).format(
tag.slug
),
self.settings['TAG_FEED_RSS']
).replace('%s', '{slug}').format(tag.slug),
feed_title=tag.name,
feed_type='rss'
)
@ -436,27 +439,23 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_ATOM'].format(
lang=lang
),
self.settings['TRANSLATION_FEED_ATOM']
.replace('%s', '{lang}').format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_ATOM_URL',
self.settings['TRANSLATION_FEED_ATOM']).format(
lang=lang
)
self.settings['TRANSLATION_FEED_ATOM']
).replace('%s', '{lang}').format(lang=lang),
)
if self.settings.get('TRANSLATION_FEED_RSS'):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_RSS'].format(
lang=lang
),
self.settings['TRANSLATION_FEED_RSS']
.replace('%s', '{lang}').format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_RSS_URL',
self.settings['TRANSLATION_FEED_RSS']).format(
lang=lang
),
self.settings['TRANSLATION_FEED_RSS']
).replace('%s', '{lang}').format(lang=lang),
feed_type='rss'
)