Skip to content

Commit d683518

Browse files
KwpolskaKwpolska
committedJul 11, 2015
Sort translations for consistent py2/py3 output
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
·
v8.3.1v7.1.1
1 parent 88c220f commit d683518

File tree

15 files changed

+26
-25
lines changed

15 files changed

+26
-25
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block extra_head %}
55
{{ super() }}
66
{% if translations|length > 1 and generate_atom %}
7-
{% for language in translations %}
7+
{% for language in translations|sort %}
88
<link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} section ({{ language }})" href="{{ _link("archive_atom", archive_name, language) }}">
99
{% endfor %}
1010
{% elif generate_atom %}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ lang="{{ lang }}">
9090
{{ rss_link }}
9191
{% elif generate_rss %}
9292
{% if translations|length > 1 %}
93-
{% for language in translations %}
93+
{% for language in translations|sort %}
9494
<link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
9595
{% endfor %}
9696
{% else %}
@@ -99,7 +99,7 @@ lang="{{ lang }}">
9999
{% endif %}
100100
{% if generate_atom %}
101101
{% if translations|length > 1 %}
102-
{% for language in translations %}
102+
{% for language in translations|sort %}
103103
<link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
104104
{% endfor %}
105105
{% else %}
@@ -110,7 +110,7 @@ lang="{{ lang }}">
110110

111111
{% macro html_translations() %}
112112
<ul class="translations">
113-
{% for langname in translations.keys() %}
113+
{% for langname in translations|sort %}
114114
{% if langname != lang %}
115115
<li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
116116
{% endif %}

Diff for: ‎nikola/data/themes/base-jinja/templates/post_header.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{% if post.translated_to|length > 1 %}
1313
<div class="metadata posttranslations translations">
1414
<h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3>
15-
{% for langname in translations.keys() %}
15+
{% for langname in translations|sort %}
1616
{% if langname != lang and post.is_translation_available(langname) %}
1717
<p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p>
1818
{% endif %}

Diff for: ‎nikola/data/themes/base-jinja/templates/post_helper.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{% macro meta_translations(post) %}
44
{% if translations|length > 1 %}
5-
{% for langname in translations.keys() %}
5+
{% for langname in translations|sort %}
66
{% if langname != lang and post.is_translation_available(langname) %}
77
<link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}">
88
{% endif %}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block extra_head %}
55
{{ super() }}
66
{% if translations|length > 1 and generate_rss %}
7-
{% for language in translations %}
7+
{% for language in translations|sort %}
88
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}">
99
{% endfor %}
1010
{% elif generate_rss %}
@@ -30,7 +30,7 @@
3030
{% endif %}
3131
<div class="metadata">
3232
{% if translations|length > 1 and generate_rss %}
33-
{% for language in translations %}
33+
{% for language in translations|sort %}
3434
<p class="feedlink">
3535
<a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a>&nbsp;
3636
</p>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{% block extra_head %}
1616
{{ super() }}
1717
{% if translations|length > 1 and generate_atom %}
18-
{% for language in translations %}
18+
{% for language in translations|sort %}
1919
<link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}">
2020
{% endfor %}
2121
{% elif generate_atom %}

Diff for: ‎nikola/data/themes/base/templates/archiveindex.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<%block name="extra_head">
55
${parent.extra_head()}
66
%if len(translations) > 1 and generate_atom:
7-
%for language in translations:
7+
%for language in sorted(translations):
88
<link rel="alternate" type="application/atom+xml" title="Atom for the ${archive_name} section (${language})" href="${_link("archive_atom", archive_name, language)}">
99
%endfor
1010
%elif generate_atom:

Diff for: ‎nikola/data/themes/base/templates/base_helper.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ lang="${lang}">
9090
${rss_link}
9191
%elif generate_rss:
9292
%if len(translations) > 1:
93-
%for language in translations:
93+
%for language in sorted(translations):
9494
<link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
9595
%endfor
9696
%else:
@@ -99,7 +99,7 @@ lang="${lang}">
9999
%endif
100100
%if generate_atom:
101101
%if len(translations) > 1:
102-
%for language in translations:
102+
%for language in sorted(translations):
103103
<link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
104104
%endfor
105105
%else:
@@ -110,7 +110,7 @@ lang="${lang}">
110110

111111
<%def name="html_translations()">
112112
<ul class="translations">
113-
%for langname in translations.keys():
113+
%for langname in sorted(translations):
114114
%if langname != lang:
115115
<li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
116116
%endif

Diff for: ‎nikola/data/themes/base/templates/post_header.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
% if len(post.translated_to) > 1:
1313
<div class="metadata posttranslations translations">
1414
<h3 class="posttranslations-intro">${messages("Also available in:")}</h3>
15-
% for langname in translations.keys():
15+
% for langname in sorted(translations):
1616
% if langname != lang and post.is_translation_available(langname):
1717
<p><a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></p>
1818
% endif

Diff for: ‎nikola/data/themes/base/templates/post_helper.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<%def name="meta_translations(post)">
44
%if len(translations) > 1:
5-
%for langname in translations.keys():
5+
%for langname in sorted(translations):
66
%if langname != lang and post.is_translation_available(langname):
77
<link rel="alternate" hreflang="${langname}" href="${post.permalink(langname)}">
88
%endif

Diff for: ‎nikola/data/themes/base/templates/tag.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<%block name="extra_head">
55
${parent.extra_head()}
66
%if len(translations) > 1 and generate_rss:
7-
%for language in translations:
7+
%for language in sorted(translations):
88
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}">
99
%endfor
1010
%elif generate_rss:
@@ -30,7 +30,7 @@
3030
%endif
3131
<div class="metadata">
3232
%if len(translations) > 1 and generate_rss:
33-
%for language in translations:
33+
%for language in sorted(translations):
3434
<p class="feedlink">
3535
<a href="${_link(kind + "_rss", tag, language)}" hreflang="${language}" type="application/rss+xml">${messages('RSS feed', language)} (${language})</a>&nbsp;
3636
</p>

Diff for: ‎nikola/data/themes/base/templates/tagindex.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<%block name="extra_head">
1616
${parent.extra_head()}
1717
%if len(translations) > 1 and generate_atom:
18-
%for language in translations:
18+
%for language in sorted(translations):
1919
<link rel="alternate" type="application/atom+xml" title="Atom for the ${tag} section (${language})" href="${_link(kind + "_atom", tag, language)}">
2020
%endfor
2121
%elif generate_atom:

Diff for: ‎nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ lang="{{ lang }}">
154154
{{ rss_link }}
155155
{% elif generate_rss %}
156156
{% if translations|length > 1 %}
157-
{% for language in translations %}
157+
{% for language in translations|sort %}
158158
<link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
159159
{% endfor %}
160160
{% else %}
@@ -163,7 +163,7 @@ lang="{{ lang }}">
163163
{% endif %}
164164
{% if generate_atom %}
165165
{% if translations|length > 1 %}
166-
{% for language in translations %}
166+
{% for language in translations|sort %}
167167
<link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
168168
{% endfor %}
169169
{% else %}
@@ -173,7 +173,7 @@ lang="{{ lang }}">
173173
{% endmacro %}
174174

175175
{% macro html_translations() %}
176-
{% for langname in translations.keys() %}
176+
{% for langname in translations|sort %}
177177
{% if langname != lang %}
178178
<li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
179179
{% endif %}

Diff for: ‎nikola/data/themes/bootstrap3/templates/base_helper.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ lang="${lang}">
154154
${rss_link}
155155
%elif generate_rss:
156156
%if len(translations) > 1:
157-
%for language in translations:
157+
%for language in sorted(translations):
158158
<link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
159159
%endfor
160160
%else:
@@ -163,7 +163,7 @@ lang="${lang}">
163163
%endif
164164
%if generate_atom:
165165
%if len(translations) > 1:
166-
%for language in translations:
166+
%for language in sorted(translations):
167167
<link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
168168
%endfor
169169
%else:
@@ -173,7 +173,7 @@ lang="${lang}">
173173
</%def>
174174

175175
<%def name="html_translations()">
176-
%for langname in translations.keys():
176+
%for langname in sorted(translations):
177177
%if langname != lang:
178178
<li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
179179
%endif

Diff for: ‎scripts/jinjify.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
["og: http://ogp.me/ns# \\", "og: http://ogp.me/ns#"],
1919
["article: http://ogp.me/ns/article# \\", "article: http://ogp.me/ns/article#"],
2020
["fb: http://ogp.me/ns/fb# \\", "fb: http://ogp.me/ns/fb#"],
21-
['dir="rtl" \\', 'dir="rtl"']
21+
['dir="rtl" \\', 'dir="rtl"'],
22+
['sorted(translations)', 'translations|sort'],
2223
]
2324

2425
dumber_replacements = [

0 commit comments

Comments
 (0)
Please sign in to comment.