Fix #2126 -- Fix wrong link handler name

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Sep 29, 2015 · a2c2084 · a2c2084
1 parent cee3b26
commit a2c2084
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -26,7 +26,8 @@ Deprecations
 ------------
 
 * Post.section_link is now deprecated (Issue #2086). Use
-  site.link('section_index_link', post.section_slug()) instead.
+  site.link('section_index', post.section_slug()) instead. (not
+  'section_index_link', as previously stated in this document)
 
 New in v7.7.1
 =============

diff --git a/nikola/data/themes/base-jinja/templates/sectionindex.tmpl b/nikola/data/themes/base-jinja/templates/sectionindex.tmpl
@@ -11,7 +11,7 @@
 {% block content %}
 <div class="sectionindex">
     <header>
-        <h2><a href="{{ _link('section_index_link', posts[0].section_slug()) }}">{{ title|e }}</a></h2>
+        <h2><a href="{{ _link('section_index', posts[0].section_slug()) }}">{{ title|e }}</a></h2>
         {% if generate_atom %}
             <p class="feedlink"><a href="{{ _link('section_index_atom', posts[0].section_slug()) }}" type="application/atom+xml">{{ messages('Updates') }}</a></p>
         {% endif %}

diff --git a/nikola/data/themes/base/templates/sectionindex.tmpl b/nikola/data/themes/base/templates/sectionindex.tmpl
@@ -11,7 +11,7 @@
 <%block name="content">
 <div class="sectionindex">
     <header>
-        <h2><a href="${_link('section_index_link', posts[0].section_slug())}">${title|h}</a></h2>
+        <h2><a href="${_link('section_index', posts[0].section_slug())}">${title|h}</a></h2>
         % if generate_atom:
             <p class="feedlink"><a href="${_link('section_index_atom', posts[0].section_slug())}" type="application/atom+xml">${messages('Updates')}</a></p>
         % endif

diff --git a/nikola/post.py b/nikola/post.py
@@ -747,7 +747,7 @@ def section_color(self, lang=None):
     def section_link(self, lang=None):
         """Return the link to the post's section (deprecated)."""
         utils.LOGGER.warning("Post.section_link is deprecated. Please use " +
-                             "site.link('section_index_link', post.section_slug()) instead.")
+                             "site.link('section_index', post.section_slug()) instead.")
         if lang is None:
             lang = nikola.utils.LocaleBorg().current_lang
 

diff --git a/sextion_index b/sextion_index
@@ -0,0 +1,4 @@
+CHANGES.txt[36m:[m  site.link('[1;31msection_index_link[m', post.section_slug()) instead.
+nikola/data/themes/base-jinja/templates/sectionindex.tmpl[36m:[m        <h2><a href="{{ _link('[1;31msection_index_link[m', posts[0].section_slug()) }}">{{ title|e }}</a></h2>
+nikola/data/themes/base/templates/sectionindex.tmpl[36m:[m        <h2><a href="${_link('[1;31msection_index_link[m', posts[0].section_slug())}">${title|h}</a></h2>
+nikola/post.py[36m:[m                             "site.link('[1;31msection_index_link[m', post.section_slug()) instead.")