Skip to content

Commit e1d0235

Browse files
KwpolskaKwpolska
committedJun 10, 2017
Rename translation_link_helper.tmpl → feeds_translations_helper.tmpl
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
·
v8.3.1v7.8.8
1 parent 7439dab commit e1d0235

22 files changed

+55
-51
lines changed
 

‎nikola/data/themes/base-jinja/templates/archiveindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'index.tmpl' %}
33
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
4-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
4+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
55

66
{% block extra_head %}
77
{{ super() }}
8-
{{ translation_links.head(archive_name) }}
8+
{{ feeds_translations.head(archive_name) }}
99
{% endblock %}
1010

1111
{% block content_header %}

‎nikola/data/themes/base-jinja/templates/author.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'list_post.tmpl' %}
3-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
3+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
44

55
{% block extra_head %}
66
{{ super() }}
7-
{{ translation_links.head(author) }}
7+
{{ feeds_translations.head(author) }}
88
{% endblock %}
99

1010

@@ -16,7 +16,7 @@
1616
<p>{{ description }}</p>
1717
{% endif %}
1818
<div class="metadata">
19-
{{ translation_links.feed_link(author) }}
19+
{{ feeds_translations.feed_link(author) }}
2020
</div>
2121
</header>
2222
{% if posts %}

‎nikola/data/themes/base-jinja/templates/authorindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'index.tmpl' %}
3-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
3+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
44

55
{% block extra_head %}
66
{{ super() }}
7-
{{ translation_links.head(author) }}
7+
{{ feeds_translations.head(author) }}
88
{% endblock %}

‎nikola/data/themes/base-jinja/templates/base_helper.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{# -*- coding: utf-8 -*- #}
2-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
2+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
33

44
{% macro html_headstart() %}
55
<!DOCTYPE html>
@@ -42,7 +42,7 @@ lang="{{ lang }}">
4242
{% if meta_generator_tag %}
4343
<meta name="generator" content="Nikola (getnikola.com)">
4444
{% endif %}
45-
{{ translation_links.head() }}
45+
{{ feeds_translations.head() }}
4646
<link rel="canonical" href="{{ abs_link(permalink) }}">
4747

4848
{% if favicons %}
@@ -100,7 +100,7 @@ lang="{{ lang }}">
100100

101101
{# This function is deprecated; use feed_helper directly. #}
102102
{% macro html_feedlinks() %}
103-
{{ translation_links.head() }}
103+
{{ feeds_translations.head() }}
104104
{% endmacro %}
105105

106106
{% macro html_translations() %}

‎nikola/data/themes/base-jinja/templates/translation_link_helper.tmpl ‎nikola/data/themes/base-jinja/templates/feeds_translations_helper.tmpl

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{# -*- coding: utf-8 -*- #}
2+
3+
{# Handles both feeds and translations #}
24
{% macro head(classification=None) %}
35
{% if rss_link %}
46
{{ rss_link }}

‎nikola/data/themes/base-jinja/templates/index.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% import 'math_helper.tmpl' as math with context %}
44
{% import 'comments_helper.tmpl' as comments with context %}
55
{% import 'pagination_helper.tmpl' as pagination with context %}
6-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
6+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
77
{% extends 'base.tmpl' %}
88

99
{% block extra_head %}
@@ -16,7 +16,7 @@
1616

1717
{% block content %}
1818
{% block content_header %}
19-
{{ translation_links.translation_link() }}
19+
{{ feeds_translations.translation_link() }}
2020
{% endblock %}
2121
{% if 'main_index' in pagekind %}
2222
{{ front_index_header }}

‎nikola/data/themes/base-jinja/templates/list.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'base.tmpl' %}
33
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
4-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
4+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
55

66
{% block content %}
77
<article class="listpage">
88
<header>
99
<h1>{{ title|e }}</h1>
1010
</header>
1111
{{ archive_nav.archive_navigation() }}
12-
{{ translation_links.translation_link() }}
12+
{{ feeds_translations.translation_link() }}
1313
{% if items %}
1414
<ul class="postlist">
1515
{% for text, link, count in items %}

‎nikola/data/themes/base-jinja/templates/list_post.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'base.tmpl' %}
33
{% import 'archive_navigation_helper.tmpl' as archive_nav with context %}
4-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
4+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
55

66
{% block content %}
77
<article class="listpage">
88
<header>
99
<h1>{{ title|e }}</h1>
1010
</header>
1111
{{ archive_nav.archive_navigation() }}
12-
{{ translation_links.translation_link() }}
12+
{{ feeds_translations.translation_link() }}
1313
{% if posts %}
1414
<ul class="postlist">
1515
{% for post in posts %}

‎nikola/data/themes/base-jinja/templates/sectionindex.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'index.tmpl' %}
3-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
3+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
44

55
{% block extra_head %}
66
{{ super() }}
7-
{{ translation_links.head(section) }}
7+
{{ feeds_translations.head(section) }}
88
{% endblock %}
99

1010
{% block content %}
1111
<div class="sectionindex">
1212
<header>
1313
<h2><a href="{{ _link('section_index', section) }}">{{ title|e }}</a></h2>
14-
{{ translation_links.feed_link(section) }}
14+
{{ feeds_translations.feed_link(section) }}
1515
</header>
1616
{{ super() }}
1717
</div>

‎nikola/data/themes/base-jinja/templates/tag.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'list_post.tmpl' %}
3-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
3+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
44

55
{% block extra_head %}
66
{{ super() }}
7-
{{ translation_links.head(tag) }}
7+
{{ feeds_translations.head(tag) }}
88
{% endblock %}
99

1010

@@ -24,9 +24,9 @@
2424
</ul>
2525
{% endif %}
2626
<div class="metadata">
27-
{{ translation_links.feed_link(tag) }}
27+
{{ feeds_translations.feed_link(tag) }}
2828
</div>
29-
{{ translation_links.translation_link() }}
29+
{{ feeds_translations.translation_link() }}
3030
</header>
3131
{% if posts %}
3232
<ul class="postlist">

‎nikola/data/themes/base-jinja/templates/tagindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{# -*- coding: utf-8 -*- #}
22
{% extends 'index.tmpl' %}
3-
{% import 'translation_link_helper.tmpl' as translation_links with context %}
3+
{% import 'feeds_translations_helper.tmpl.tmpl' as feeds_translations with context %}
44

55
{% block content_header %}
66
{{ parent.content_header() }}
@@ -22,5 +22,5 @@
2222

2323
{% block extra_head %}
2424
{{ super() }}
25-
{{ translation_links.head(tag) }}
25+
{{ feeds_translations.head(tag) }}
2626
{% endblock %}

‎nikola/data/themes/base/templates/archiveindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="index.tmpl"/>
33
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
4-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
4+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
55

66
<%block name="extra_head">
77
${parent.extra_head()}
8-
${translation_links.head(archive_name)}
8+
${feeds_translations.head(archive_name)}
99
</%block>
1010

1111
<%block name="content_header">

‎nikola/data/themes/base/templates/author.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="list_post.tmpl"/>
3-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
3+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
44

55
<%block name="extra_head">
66
${parent.extra_head()}
7-
${translation_links.head(author)}
7+
${feeds_translations.head(author)}
88
</%block>
99

1010

@@ -16,7 +16,7 @@
1616
<p>${description}</p>
1717
%endif
1818
<div class="metadata">
19-
${translation_links.feed_link(author)}
19+
${feeds_translations.feed_link(author)}
2020
</div>
2121
</header>
2222
%if posts:

‎nikola/data/themes/base/templates/authorindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="index.tmpl"/>
3-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
3+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
44

55
<%block name="extra_head">
66
${parent.extra_head()}
7-
${translation_links.head(author)}
7+
${feeds_translations.head(author)}
88
</%block>

‎nikola/data/themes/base/templates/base_helper.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## -*- coding: utf-8 -*-
2-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
2+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
33

44
<%def name="html_headstart()">
55
<!DOCTYPE html>
@@ -42,7 +42,7 @@ lang="${lang}">
4242
% if meta_generator_tag:
4343
<meta name="generator" content="Nikola (getnikola.com)">
4444
% endif
45-
${translation_links.head()}
45+
${feeds_translations.head()}
4646
<link rel="canonical" href="${abs_link(permalink)}">
4747

4848
%if favicons:
@@ -100,7 +100,7 @@ lang="${lang}">
100100

101101
### This function is deprecated; use feed_helper directly.
102102
<%def name="html_feedlinks()">
103-
${translation_links.head()}
103+
${feeds_translations.head()}
104104
</%def>
105105

106106
<%def name="html_translations()">

‎nikola/data/themes/base/templates/translation_link_helper.tmpl ‎nikola/data/themes/base/templates/feeds_translations_helper.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## -*- coding: utf-8 -*-
2+
3+
## Handles both feeds and translations
24
<%def name="head(classification=None)">
35
% if rss_link:
46
${rss_link}
@@ -86,4 +88,4 @@
8688
%endfor
8789
</div>
8890
%endif
89-
</%def>
91+
</%def>

‎nikola/data/themes/base/templates/index.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<%namespace name="math" file="math_helper.tmpl"/>
44
<%namespace name="comments" file="comments_helper.tmpl"/>
55
<%namespace name="pagination" file="pagination_helper.tmpl"/>
6-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
6+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
77
<%inherit file="base.tmpl"/>
88

99
<%block name="extra_head">
@@ -16,7 +16,7 @@
1616

1717
<%block name="content">
1818
<%block name="content_header">
19-
${translation_links.translation_link()}
19+
${feeds_translations.translation_link()}
2020
</%block>
2121
% if 'main_index' in pagekind:
2222
${front_index_header}

‎nikola/data/themes/base/templates/list.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="base.tmpl"/>
33
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
4-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
4+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
55

66
<%block name="content">
77
<article class="listpage">
88
<header>
99
<h1>${title|h}</h1>
1010
</header>
1111
${archive_nav.archive_navigation()}
12-
${translation_links.translation_link()}
12+
${feeds_translations.translation_link()}
1313
%if items:
1414
<ul class="postlist">
1515
% for text, link, count in items:

‎nikola/data/themes/base/templates/list_post.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="base.tmpl"/>
33
<%namespace name="archive_nav" file="archive_navigation_helper.tmpl" import="*"/>
4-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
4+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
55

66
<%block name="content">
77
<article class="listpage">
88
<header>
99
<h1>${title|h}</h1>
1010
</header>
1111
${archive_nav.archive_navigation()}
12-
${translation_links.translation_link()}
12+
${feeds_translations.translation_link()}
1313
%if posts:
1414
<ul class="postlist">
1515
% for post in posts:

‎nikola/data/themes/base/templates/sectionindex.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="index.tmpl"/>
3-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
3+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
44

55
<%block name="extra_head">
66
${parent.extra_head()}
7-
${translation_links.head(section)}
7+
${feeds_translations.head(section)}
88
</%block>
99

1010
<%block name="content">
1111
<div class="sectionindex">
1212
<header>
1313
<h2><a href="${_link('section_index', section)}">${title|h}</a></h2>
14-
${translation_links.feed_link(section)}
14+
${feeds_translations.feed_link(section)}
1515
</header>
1616
${parent.content()}
1717
</div>

‎nikola/data/themes/base/templates/tag.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="list_post.tmpl"/>
3-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
3+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
44

55
<%block name="extra_head">
66
${parent.extra_head()}
7-
${translation_links.head(tag)}
7+
${feeds_translations.head(tag)}
88
</%block>
99

1010

@@ -24,9 +24,9 @@
2424
</ul>
2525
%endif
2626
<div class="metadata">
27-
${translation_links.feed_link(tag)}
27+
${feeds_translations.feed_link(tag)}
2828
</div>
29-
${translation_links.translation_link()}
29+
${feeds_translations.translation_link()}
3030
</header>
3131
%if posts:
3232
<ul class="postlist">

‎nikola/data/themes/base/templates/tagindex.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## -*- coding: utf-8 -*-
22
<%inherit file="index.tmpl"/>
3-
<%namespace name="translation_links" file="translation_link_helper.tmpl" import="*"/>
3+
<%namespace name="feeds_translations" file="feeds_translations_helper.tmpl.tmpl" import="*"/>
44

55
<%block name="content_header">
66
${parent.content_header()}
@@ -22,5 +22,5 @@
2222

2323
<%block name="extra_head">
2424
${parent.extra_head()}
25-
${translation_links.head(tag)}
25+
${feeds_translations.head(tag)}
2626
</%block>

0 commit comments

Comments
 (0)
Please sign in to comment.