Fixing configurations relying on buggy behavior.

getnikola · Feb 1, 2017 · 590736c · 590736c
1 parent d4c0f3a
commit 590736c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/nikola/plugins/task/categories.py b/nikola/plugins/task/categories.py
@@ -100,7 +100,11 @@ def get_classification_friendly_name(self, classification, lang, only_last_compo
     def get_overview_path(self, lang, dest_type='page'):
         """A path handler for the list of all classifications."""
         if self.site.config['CATEGORIES_INDEX_PATH'](lang):
-            return [_f for _f in [self.site.config['CATEGORIES_INDEX_PATH'](lang)] if _f], 'never'
+            path = self.site.config['CATEGORIES_INDEX_PATH'](lang)
+            if path.endswith('/index'):  # TODO: remove in v8
+                utils.LOGGER.warn("CATEGORIES_INDEX_PATH for language {0} is missing a .html extension. Please update your configuration!".format(lang))
+                path += '.html'
+            return [_f for _f in [path] if _f], 'never'
         else:
             return [_f for _f in [self.site.config['CATEGORY_PATH'](lang)] if _f], 'always'
 

diff --git a/nikola/plugins/task/tags.py b/nikola/plugins/task/tags.py
@@ -104,7 +104,11 @@ def slugify_tag_name(self, name, lang):
     def get_overview_path(self, lang, dest_type='page'):
         """A path handler for the list of all classifications."""
         if self.site.config['TAGS_INDEX_PATH'](lang):
-            return [_f for _f in [self.site.config['TAGS_INDEX_PATH'](lang)] if _f], 'never'
+            path = self.site.config['TAGS_INDEX_PATH'](lang)
+            if path.endswith('/index'):  # TODO: remove in v8
+                utils.LOGGER.warn("TAGS_INDEX_PATH for language {0} is missing a .html extension. Please update your configuration!".format(lang))
+                path += '.html'
+            return [_f for _f in [path] if _f], 'never'
         else:
             return [_f for _f in [self.site.config['TAG_PATH'](lang)] if _f], 'always'