From 6e4a26ea821fd3bd79c836c3f8bd4f770c8477e0 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 17 Sep 2018 21:55:21 -0600
Subject: [PATCH] Support both old and new style string substitutions

---
 pelican/generators.py | 53 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 0818ae06..d9761f53 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -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'
                         )