diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl index f5e61d075e..d75fd8a658 100644 --- a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl @@ -1,7 +1,7 @@ {# -*- coding: utf-8 -*- #} {% extends 'index.tmpl' %} {% import 'archive_navigation_helper.tmpl' as archive_nav with context %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block extra_head %} {{ super() }} diff --git a/nikola/data/themes/base-jinja/templates/author.tmpl b/nikola/data/themes/base-jinja/templates/author.tmpl index 93a97dfe78..e3728a4ce7 100644 --- a/nikola/data/themes/base-jinja/templates/author.tmpl +++ b/nikola/data/themes/base-jinja/templates/author.tmpl @@ -1,6 +1,6 @@ {# -*- coding: utf-8 -*- #} {% extends 'list_post.tmpl' %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block extra_head %} {{ super() }} diff --git a/nikola/data/themes/base-jinja/templates/authorindex.tmpl b/nikola/data/themes/base-jinja/templates/authorindex.tmpl index fd7cf0baf8..0a1051bf23 100644 --- a/nikola/data/themes/base-jinja/templates/authorindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/authorindex.tmpl @@ -1,6 +1,6 @@ {# -*- coding: utf-8 -*- #} {% extends 'index.tmpl' %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block extra_head %} {{ super() }} diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl index 2d5abfdfa9..7813bc2679 100644 --- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl @@ -1,5 +1,5 @@ {# -*- coding: utf-8 -*- #} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% macro html_headstart() %} diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl index 8e3fa5dc66..6accaa1d9f 100644 --- a/nikola/data/themes/base-jinja/templates/index.tmpl +++ b/nikola/data/themes/base-jinja/templates/index.tmpl @@ -3,7 +3,7 @@ {% import 'math_helper.tmpl' as math with context %} {% import 'comments_helper.tmpl' as comments with context %} {% import 'pagination_helper.tmpl' as pagination with context %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% extends 'base.tmpl' %} {% block extra_head %} diff --git a/nikola/data/themes/base-jinja/templates/list.tmpl b/nikola/data/themes/base-jinja/templates/list.tmpl index c1b0d9f7d6..5ef2a2882e 100644 --- a/nikola/data/themes/base-jinja/templates/list.tmpl +++ b/nikola/data/themes/base-jinja/templates/list.tmpl @@ -1,7 +1,7 @@ {# -*- coding: utf-8 -*- #} {% extends 'base.tmpl' %} {% import 'archive_navigation_helper.tmpl' as archive_nav with context %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block content %}
diff --git a/nikola/data/themes/base-jinja/templates/list_post.tmpl b/nikola/data/themes/base-jinja/templates/list_post.tmpl index 1ac4d2fdbe..b1f4060ccf 100644 --- a/nikola/data/themes/base-jinja/templates/list_post.tmpl +++ b/nikola/data/themes/base-jinja/templates/list_post.tmpl @@ -1,7 +1,7 @@ {# -*- coding: utf-8 -*- #} {% extends 'base.tmpl' %} {% import 'archive_navigation_helper.tmpl' as archive_nav with context %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block content %}
diff --git a/nikola/data/themes/base-jinja/templates/sectionindex.tmpl b/nikola/data/themes/base-jinja/templates/sectionindex.tmpl index 1e2c38b980..6cb7fda03b 100644 --- a/nikola/data/themes/base-jinja/templates/sectionindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/sectionindex.tmpl @@ -1,6 +1,6 @@ {# -*- coding: utf-8 -*- #} {% extends 'index.tmpl' %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block extra_head %} {{ super() }} diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl index f442e0a430..d0688db4b1 100644 --- a/nikola/data/themes/base-jinja/templates/tag.tmpl +++ b/nikola/data/themes/base-jinja/templates/tag.tmpl @@ -1,6 +1,6 @@ {# -*- coding: utf-8 -*- #} {% extends 'list_post.tmpl' %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block extra_head %} {{ super() }} diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl index f22784c83d..cb18749af8 100644 --- a/nikola/data/themes/base-jinja/templates/tagindex.tmpl +++ b/nikola/data/themes/base-jinja/templates/tagindex.tmpl @@ -1,6 +1,6 @@ {# -*- coding: utf-8 -*- #} {% extends 'index.tmpl' %} -{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% block content_header %} {{ parent.content_header() }} diff --git a/nikola/data/themes/base/templates/archiveindex.tmpl b/nikola/data/themes/base/templates/archiveindex.tmpl index 4b90e7b6b7..ef4c2b3d05 100644 --- a/nikola/data/themes/base/templates/archiveindex.tmpl +++ b/nikola/data/themes/base/templates/archiveindex.tmpl @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="index.tmpl"/> <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="extra_head"> ${parent.extra_head()} diff --git a/nikola/data/themes/base/templates/author.tmpl b/nikola/data/themes/base/templates/author.tmpl index 294051aac8..72eb9c6a50 100644 --- a/nikola/data/themes/base/templates/author.tmpl +++ b/nikola/data/themes/base/templates/author.tmpl @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="list_post.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="extra_head"> ${parent.extra_head()} diff --git a/nikola/data/themes/base/templates/authorindex.tmpl b/nikola/data/themes/base/templates/authorindex.tmpl index b265a8c5b3..7767580d7c 100644 --- a/nikola/data/themes/base/templates/authorindex.tmpl +++ b/nikola/data/themes/base/templates/authorindex.tmpl @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="index.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="extra_head"> ${parent.extra_head()} diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl index deeafda7cd..bab834f4e0 100644 --- a/nikola/data/themes/base/templates/base_helper.tmpl +++ b/nikola/data/themes/base/templates/base_helper.tmpl @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%def name="html_headstart()"> diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl index 3b0e3b1dde..a775c73c60 100644 --- a/nikola/data/themes/base/templates/index.tmpl +++ b/nikola/data/themes/base/templates/index.tmpl @@ -3,7 +3,7 @@ <%namespace name="math" file="math_helper.tmpl"/> <%namespace name="comments" file="comments_helper.tmpl"/> <%namespace name="pagination" file="pagination_helper.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%inherit file="base.tmpl"/> <%block name="extra_head"> diff --git a/nikola/data/themes/base/templates/list.tmpl b/nikola/data/themes/base/templates/list.tmpl index 2f50ddcc15..9b3b34c1b9 100644 --- a/nikola/data/themes/base/templates/list.tmpl +++ b/nikola/data/themes/base/templates/list.tmpl @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="base.tmpl"/> <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="content">
diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl index fc57e5999b..4c50394780 100644 --- a/nikola/data/themes/base/templates/list_post.tmpl +++ b/nikola/data/themes/base/templates/list_post.tmpl @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="base.tmpl"/> <%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="content">
diff --git a/nikola/data/themes/base/templates/sectionindex.tmpl b/nikola/data/themes/base/templates/sectionindex.tmpl index 93fe1bedd0..093e87e462 100644 --- a/nikola/data/themes/base/templates/sectionindex.tmpl +++ b/nikola/data/themes/base/templates/sectionindex.tmpl @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="index.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="extra_head"> ${parent.extra_head()} diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl index 2f101fa189..cba52d3125 100644 --- a/nikola/data/themes/base/templates/tag.tmpl +++ b/nikola/data/themes/base/templates/tag.tmpl @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="list_post.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="extra_head"> ${parent.extra_head()} diff --git a/nikola/data/themes/base/templates/tagindex.tmpl b/nikola/data/themes/base/templates/tagindex.tmpl index a7cedbc02b..fa30e7779c 100644 --- a/nikola/data/themes/base/templates/tagindex.tmpl +++ b/nikola/data/themes/base/templates/tagindex.tmpl @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="index.tmpl"/> -<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%block name="content_header"> ${parent.content_header()} diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl index 12ad41954d..925d906391 100644 --- a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl +++ b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl @@ -1,7 +1,7 @@ {# -*- coding: utf-8 -*- #} {% import 'annotation_helper.tmpl' as notes with context %} -{% import 'translation_link_helper.tmpl' as translation_links with context %} +{% import 'feeds_translations_helper.tmpl' as feeds_translations with context %} {% macro html_headstart() %} {% if meta_generator_tag %} {% endif %} - {{ translation_links.head() }} + {{ feeds_translations.head() }} {% if favicons %} @@ -161,7 +161,7 @@ lang="{{ lang }}"> {% endmacro %} {% macro html_feedlinks() %} - {{ translation_links.head() }} + {{ feeds_translations.head() }} {% endmacro %} {% macro html_translations() %} diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl index 1855c0ccb7..ede12d4b26 100644 --- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%namespace name="notes" file="annotation_helper.tmpl" import="*" /> -<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*" /> +<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl" import="*"/> <%def name="html_headstart()"> % if meta_generator_tag: % endif - ${translation_links.head()} + ${feeds_translations.head()} %if favicons: @@ -161,7 +161,7 @@ lang="${lang}"> <%def name="html_feedlinks()"> - ${translation_links.head()} + ${feeds_translations.head()} <%def name="html_translations()">