Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f2f1680da83^
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38830120e3b8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 17, 2015

  1. Fixed wrong source object.

    @felixfontein
    felixfontein committed May 17, 2015
    Copy the full SHA
    8f2f168 View commit details

  2. Improving RSS title in generated tag index page.

    @felixfontein
    felixfontein committed May 17, 2015
    Copy the full SHA
    3883012 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 nikola/plugins/task/tags.py
8 changes: 4 additions & 4 deletions nikola/plugins/task/tags.py
View file
Original file line number Diff line number Diff line change
@@ -114,8 +114,8 @@ def gen_tasks(self):
if slug in categories:
other_category = categories[slug]
utils.LOGGER.error('You have categories that are too similar: {0} and {1}'.format(category, other_category))
utils.LOGGER.error('Category {0} is used in: {1}'.format(category, ', '.join([p.source_path for p in self.posts_per_category[category]])))
utils.LOGGER.error('Category {0} is used in: {1}'.format(other_category, ', '.join([p.source_path for p in self.posts_per_category[other_category]])))
utils.LOGGER.error('Category {0} is used in: {1}'.format(category, ', '.join([p.source_path for p in self.site.posts_per_category[category]])))
utils.LOGGER.error('Category {0} is used in: {1}'.format(other_category, ', '.join([p.source_path for p in self.site.posts_per_category[other_category]])))
sys.exit(1)
categories[slug] = category

@@ -270,14 +270,14 @@ def page_path(i, displayed_i, num_pages, force_addition, extension=None):
return utils.adjust_name_for_index_path(self.site.path(kind + feed, tag, lang), i, displayed_i, lang, self.site, force_addition, extension)

context_source = {}
title = self._get_title(tag, is_category)
if kw["generate_rss"]:
# On a tag page, the feeds include the tag's feeds
rss_link = ("""<link rel="alternate" type="application/rss+xml" """
"""type="application/rss+xml" title="RSS for tag """
"""{0} ({1})" href="{2}">""".format(
tag, lang, self.site.link(kind + "_rss", tag, lang)))
title, lang, self.site.link(kind + "_rss", tag, lang)))
context_source['rss_link'] = rss_link
title = self._get_title(tag, is_category)
if is_category:
context_source["category"] = tag
context_source["category_path"] = self.site.parse_category_name(tag)