diff options
Diffstat (limited to 'nikola/plugins/task/rss.py')
| -rw-r--r-- | nikola/plugins/task/rss.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/nikola/plugins/task/rss.py b/nikola/plugins/task/rss.py index 9e4204c..b16ed48 100644 --- a/nikola/plugins/task/rss.py +++ b/nikola/plugins/task/rss.py @@ -54,8 +54,11 @@ class GenerateRSS(Task): "blog_description": self.site.config["BLOG_DESCRIPTION"], "output_folder": self.site.config["OUTPUT_FOLDER"], "rss_teasers": self.site.config["RSS_TEASERS"], - "hide_untranslated_posts": self.site.config['HIDE_UNTRANSLATED_POSTS'], + "rss_plain": self.site.config["RSS_PLAIN"], + "show_untranslated_posts": self.site.config['SHOW_UNTRANSLATED_POSTS'], "feed_length": self.site.config['FEED_LENGTH'], + "tzinfo": self.site.tzinfo, + "rss_read_more_link": self.site.config["RSS_READ_MORE_LINK"], } self.site.scan_posts() # Check for any changes in the state of use_in_feeds for any post. @@ -68,24 +71,25 @@ class GenerateRSS(Task): output_name = os.path.join(kw['output_folder'], self.site.path("rss", None, lang)) deps = [] - if kw["hide_untranslated_posts"]: - posts = [x for x in self.site.timeline if x.use_in_feeds - and x.is_translation_available(lang)][:10] + if kw["show_untranslated_posts"]: + posts = self.site.posts[:10] else: - posts = [x for x in self.site.timeline if x.use_in_feeds][:10] + posts = [x for x in self.site.posts if x.is_translation_available(lang)][:10] for post in posts: deps += post.deps(lang) feed_url = urljoin(self.site.config['BASE_URL'], self.site.link("rss", None, lang).lstrip('/')) + yield { 'basename': 'generate_rss', 'name': os.path.normpath(output_name), 'file_dep': deps, 'targets': [output_name], 'actions': [(utils.generic_rss_renderer, - (lang, kw["blog_title"], kw["site_url"], - kw["blog_description"], posts, output_name, - kw["rss_teasers"], kw['feed_length'], feed_url))], + (lang, kw["blog_title"](lang), kw["site_url"], + kw["blog_description"](lang), posts, output_name, + kw["rss_teasers"], kw["rss_plain"], kw['feed_length'], feed_url))], + 'task_dep': ['render_posts'], 'clean': True, 'uptodate': [utils.config_changed(kw)], |