Skip to content

Commit

Permalink
Feeds - Update generators.py to fix a bug with slugs (#3279)
Browse files Browse the repository at this point in the history
  • Loading branch information
namori authored Jan 23, 2024
1 parent f2ab4a1 commit 2fa5c51
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions pelican/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,8 @@ def generate_feeds(self, writer):
str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
self.settings.get(
"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,
)

Expand All @@ -396,8 +396,8 @@ def generate_feeds(self, writer):
str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
self.settings.get(
"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_type="rss",
)
Expand All @@ -410,8 +410,8 @@ def generate_feeds(self, writer):
str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
self.settings.get(
"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,
)

Expand All @@ -422,8 +422,8 @@ def generate_feeds(self, writer):
str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
self.settings.get(
"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_type="rss",
)
Expand All @@ -437,8 +437,8 @@ def generate_feeds(self, writer):
str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
self.settings.get(
"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,
)

Expand All @@ -449,8 +449,8 @@ def generate_feeds(self, writer):
str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
self.settings.get(
"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_type="rss",
)
Expand All @@ -471,10 +471,8 @@ def generate_feeds(self, writer):
str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang),
self.settings.get(
"TRANSLATION_FEED_ATOM_URL",
str(self.settings["TRANSLATION_FEED_ATOM"]).format(
lang=lang
),
),
str(self.settings["TRANSLATION_FEED_ATOM"]),
).format(lang=lang),
)
if self.settings.get("TRANSLATION_FEED_RSS"):
writer.write_feed(
Expand Down

0 comments on commit 2fa5c51

Please sign in to comment.