From 75fa793b5a10ea84e300a69470af5a4b55da4dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fl=C3=B3rez?= Date: Sun, 23 Mar 2014 13:56:14 -0500 Subject: [PATCH 1/3] Update generators.py Allow the use of {category}, {author} and/or {lang} for period archive generations. --- pelican/generators.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pelican/generators.py b/pelican/generators.py index bfdac1a5..6dfc4a47 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -304,7 +304,15 @@ class ArticlesGenerator(Generator): # format string syntax can be used for specifying the # period archive dates date = archive[0].date - save_as = save_as_fmt.format(date=date) + category = archive[0].category + lang = archive[0].lang + author = archive[0].author + save_as = save_as_fmt.format( + date=date, + category=category, + lang=lang, + author=author + ) context = self.context.copy() if key == period_date_key['year']: From dcdbd5333fd9fe6531dcc3c08ccf9adce99fcc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fl=C3=B3rez?= Date: Sun, 23 Mar 2014 23:28:44 -0500 Subject: [PATCH 2/3] Update generators.py Period archives doesn't have an author --- pelican/generators.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index 6dfc4a47..fa0f22aa 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -306,12 +306,10 @@ class ArticlesGenerator(Generator): date = archive[0].date category = archive[0].category lang = archive[0].lang - author = archive[0].author save_as = save_as_fmt.format( date=date, category=category, - lang=lang, - author=author + lang=lang ) context = self.context.copy() From 2bdd1b28a47fdb628c26930572282fdd92b858c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fl=C3=B3rez?= Date: Sun, 23 Mar 2014 13:56:14 -0500 Subject: [PATCH 3/3] Update generators.py Allow the use of {category}, {author} and/or {lang} for period archive generations. --- pelican/generators.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pelican/generators.py b/pelican/generators.py index 1b584d3f..f7437d9e 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -322,7 +322,14 @@ class ArticlesGenerator(Generator): # Let date.__format__() work with byte strings instead of characters since it fails to work with characters bytes_save_as_fmt = save_as_fmt.encode('utf8') bytes_save_as = bytes_save_as_fmt.format(date=date) - save_as = unicode(bytes_save_as,'utf8') + save_as = unicode(bytes_save_as, 'utf8') + category = archive[0].category + lang = archive[0].lang + save_as = save_as_fmt.format( + date=date, + category=category, + lang=lang + ) context = self.context.copy() if key == period_date_key['year']: