weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Feeds - Update generators.py to fix a bug with slugs (#3279)

Browse source
This commit is contained in:
namori 2024-01-23 09:43:07 +01:00 • committed by GitHub
commit 2fa5c515b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pelican/generators.py
View file

@ -384,8 +384,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug), str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
self.settings.get( self.settings.get(
"CATEGORY_FEED_ATOM_URL", "CATEGORY_FEED_ATOM_URL",
str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug), str(self.settings["CATEGORY_FEED_ATOM"]),
), ).format(slug=cat.slug),
feed_title=cat.name, feed_title=cat.name,
) )
@ -396,8 +396,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug), str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
self.settings.get( self.settings.get(
"CATEGORY_FEED_RSS_URL", "CATEGORY_FEED_RSS_URL",
str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug), str(self.settings["CATEGORY_FEED_RSS"]),
), ).format(slug=cat.slug),
feed_title=cat.name, feed_title=cat.name,
feed_type="rss", feed_type="rss",
) )
@ -410,8 +410,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug), str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
self.settings.get( self.settings.get(
"AUTHOR_FEED_ATOM_URL", "AUTHOR_FEED_ATOM_URL",
str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug), str(self.settings["AUTHOR_FEED_ATOM"]),
), ).format(slug=auth.slug),
feed_title=auth.name, feed_title=auth.name,
) )
@ -422,8 +422,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug), str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
self.settings.get( self.settings.get(
"AUTHOR_FEED_RSS_URL", "AUTHOR_FEED_RSS_URL",
str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug), str(self.settings["AUTHOR_FEED_RSS"]),
), ).format(slug=auth.slug),
feed_title=auth.name, feed_title=auth.name,
feed_type="rss", feed_type="rss",
) )
@ -437,8 +437,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug), str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
self.settings.get( self.settings.get(
"TAG_FEED_ATOM_URL", "TAG_FEED_ATOM_URL",
str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug), str(self.settings["TAG_FEED_ATOM"]),
), ).format(slug=tag.slug),
feed_title=tag.name, feed_title=tag.name,
) )
@ -449,8 +449,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug), str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
self.settings.get( self.settings.get(
"TAG_FEED_RSS_URL", "TAG_FEED_RSS_URL",
str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug), str(self.settings["TAG_FEED_RSS"]),
), ).format(slug=tag.slug),
feed_title=tag.name, feed_title=tag.name,
feed_type="rss", feed_type="rss",
) )
@ -471,10 +471,8 @@ class ArticlesGenerator(CachingGenerator):
str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang), str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang),
self.settings.get( self.settings.get(
"TRANSLATION_FEED_ATOM_URL", "TRANSLATION_FEED_ATOM_URL",
str(self.settings["TRANSLATION_FEED_ATOM"]).format( str(self.settings["TRANSLATION_FEED_ATOM"]),
lang=lang ).format(lang=lang),
),
),
) )
if self.settings.get("TRANSLATION_FEED_RSS"): if self.settings.get("TRANSLATION_FEED_RSS"):
writer.write_feed( writer.write_feed(