Skip to content

Commit

Permalink
Sort translations for consistent py2/py3 output
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Jul 11, 2015
1 parent 88c220f commit d683518
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/archiveindex.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block extra_head %} {% block extra_head %}
{{ super() }} {{ super() }}
{% if translations|length > 1 and generate_atom %} {% if translations|length > 1 and generate_atom %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} section ({{ language }})" href="{{ _link("archive_atom", archive_name, language) }}"> <link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} section ({{ language }})" href="{{ _link("archive_atom", archive_name, language) }}">
{% endfor %} {% endfor %}
{% elif generate_atom %} {% elif generate_atom %}
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base-jinja/templates/base_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ lang="{{ lang }}">
{{ rss_link }} {{ rss_link }}
{% elif generate_rss %} {% elif generate_rss %}
{% if translations|length > 1 %} {% if translations|length > 1 %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}"> <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
{% endfor %} {% endfor %}
{% else %} {% else %}
Expand All @@ -99,7 +99,7 @@ lang="{{ lang }}">
{% endif %} {% endif %}
{% if generate_atom %} {% if generate_atom %}
{% if translations|length > 1 %} {% if translations|length > 1 %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}"> <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
{% endfor %} {% endfor %}
{% else %} {% else %}
Expand All @@ -110,7 +110,7 @@ lang="{{ lang }}">


{% macro html_translations() %} {% macro html_translations() %}
<ul class="translations"> <ul class="translations">
{% for langname in translations.keys() %} {% for langname in translations|sort %}
{% if langname != lang %} {% if langname != lang %}
<li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
{% endif %} {% endif %}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/post_header.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% if post.translated_to|length > 1 %} {% if post.translated_to|length > 1 %}
<div class="metadata posttranslations translations"> <div class="metadata posttranslations translations">
<h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3> <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3>
{% for langname in translations.keys() %} {% for langname in translations|sort %}
{% if langname != lang and post.is_translation_available(langname) %} {% if langname != lang and post.is_translation_available(langname) %}
<p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p> <p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p>
{% endif %} {% endif %}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/post_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


{% macro meta_translations(post) %} {% macro meta_translations(post) %}
{% if translations|length > 1 %} {% if translations|length > 1 %}
{% for langname in translations.keys() %} {% for langname in translations|sort %}
{% if langname != lang and post.is_translation_available(langname) %} {% if langname != lang and post.is_translation_available(langname) %}
<link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}"> <link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}">
{% endif %} {% endif %}
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base-jinja/templates/tag.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block extra_head %} {% block extra_head %}
{{ super() }} {{ super() }}
{% if translations|length > 1 and generate_rss %} {% if translations|length > 1 and generate_rss %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}"> <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}">
{% endfor %} {% endfor %}
{% elif generate_rss %} {% elif generate_rss %}
Expand All @@ -30,7 +30,7 @@
{% endif %} {% endif %}
<div class="metadata"> <div class="metadata">
{% if translations|length > 1 and generate_rss %} {% if translations|length > 1 and generate_rss %}
{% for language in translations %} {% for language in translations|sort %}
<p class="feedlink"> <p class="feedlink">
<a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a>&nbsp; <a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a>&nbsp;
</p> </p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/tagindex.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% block extra_head %} {% block extra_head %}
{{ super() }} {{ super() }}
{% if translations|length > 1 and generate_atom %} {% if translations|length > 1 and generate_atom %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}"> <link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}">
{% endfor %} {% endfor %}
{% elif generate_atom %} {% elif generate_atom %}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/archiveindex.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<%block name="extra_head"> <%block name="extra_head">
${parent.extra_head()} ${parent.extra_head()}
%if len(translations) > 1 and generate_atom: %if len(translations) > 1 and generate_atom:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/atom+xml" title="Atom for the ${archive_name} section (${language})" href="${_link("archive_atom", archive_name, language)}"> <link rel="alternate" type="application/atom+xml" title="Atom for the ${archive_name} section (${language})" href="${_link("archive_atom", archive_name, language)}">
%endfor %endfor
%elif generate_atom: %elif generate_atom:
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/base/templates/base_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ lang="${lang}">
${rss_link} ${rss_link}
%elif generate_rss: %elif generate_rss:
%if len(translations) > 1: %if len(translations) > 1:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
%endfor %endfor
%else: %else:
Expand All @@ -99,7 +99,7 @@ lang="${lang}">
%endif %endif
%if generate_atom: %if generate_atom:
%if len(translations) > 1: %if len(translations) > 1:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}"> <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
%endfor %endfor
%else: %else:
Expand All @@ -110,7 +110,7 @@ lang="${lang}">


<%def name="html_translations()"> <%def name="html_translations()">
<ul class="translations"> <ul class="translations">
%for langname in translations.keys(): %for langname in sorted(translations):
%if langname != lang: %if langname != lang:
<li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
%endif %endif
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/post_header.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
% if len(post.translated_to) > 1: % if len(post.translated_to) > 1:
<div class="metadata posttranslations translations"> <div class="metadata posttranslations translations">
<h3 class="posttranslations-intro">${messages("Also available in:")}</h3> <h3 class="posttranslations-intro">${messages("Also available in:")}</h3>
% for langname in translations.keys(): % for langname in sorted(translations):
% if langname != lang and post.is_translation_available(langname): % if langname != lang and post.is_translation_available(langname):
<p><a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></p> <p><a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></p>
% endif % endif
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/post_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


<%def name="meta_translations(post)"> <%def name="meta_translations(post)">
%if len(translations) > 1: %if len(translations) > 1:
%for langname in translations.keys(): %for langname in sorted(translations):
%if langname != lang and post.is_translation_available(langname): %if langname != lang and post.is_translation_available(langname):
<link rel="alternate" hreflang="${langname}" href="${post.permalink(langname)}"> <link rel="alternate" hreflang="${langname}" href="${post.permalink(langname)}">
%endif %endif
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/tag.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<%block name="extra_head"> <%block name="extra_head">
${parent.extra_head()} ${parent.extra_head()}
%if len(translations) > 1 and generate_rss: %if len(translations) > 1 and generate_rss:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}"> <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}">
%endfor %endfor
%elif generate_rss: %elif generate_rss:
Expand All @@ -30,7 +30,7 @@
%endif %endif
<div class="metadata"> <div class="metadata">
%if len(translations) > 1 and generate_rss: %if len(translations) > 1 and generate_rss:
%for language in translations: %for language in sorted(translations):
<p class="feedlink"> <p class="feedlink">
<a href="${_link(kind + "_rss", tag, language)}" hreflang="${language}" type="application/rss+xml">${messages('RSS feed', language)} (${language})</a>&nbsp; <a href="${_link(kind + "_rss", tag, language)}" hreflang="${language}" type="application/rss+xml">${messages('RSS feed', language)} (${language})</a>&nbsp;
</p> </p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/tagindex.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<%block name="extra_head"> <%block name="extra_head">
${parent.extra_head()} ${parent.extra_head()}
%if len(translations) > 1 and generate_atom: %if len(translations) > 1 and generate_atom:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/atom+xml" title="Atom for the ${tag} section (${language})" href="${_link(kind + "_atom", tag, language)}"> <link rel="alternate" type="application/atom+xml" title="Atom for the ${tag} section (${language})" href="${_link(kind + "_atom", tag, language)}">
%endfor %endfor
%elif generate_atom: %elif generate_atom:
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ lang="{{ lang }}">
{{ rss_link }} {{ rss_link }}
{% elif generate_rss %} {% elif generate_rss %}
{% if translations|length > 1 %} {% if translations|length > 1 %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}"> <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
{% endfor %} {% endfor %}
{% else %} {% else %}
Expand All @@ -163,7 +163,7 @@ lang="{{ lang }}">
{% endif %} {% endif %}
{% if generate_atom %} {% if generate_atom %}
{% if translations|length > 1 %} {% if translations|length > 1 %}
{% for language in translations %} {% for language in translations|sort %}
<link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}"> <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
{% endfor %} {% endfor %}
{% else %} {% else %}
Expand All @@ -173,7 +173,7 @@ lang="{{ lang }}">
{% endmacro %} {% endmacro %}


{% macro html_translations() %} {% macro html_translations() %}
{% for langname in translations.keys() %} {% for langname in translations|sort %}
{% if langname != lang %} {% if langname != lang %}
<li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
{% endif %} {% endif %}
Expand Down
6 changes: 3 additions & 3 deletions nikola/data/themes/bootstrap3/templates/base_helper.tmpl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ lang="${lang}">
${rss_link} ${rss_link}
%elif generate_rss: %elif generate_rss:
%if len(translations) > 1: %if len(translations) > 1:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
%endfor %endfor
%else: %else:
Expand All @@ -163,7 +163,7 @@ lang="${lang}">
%endif %endif
%if generate_atom: %if generate_atom:
%if len(translations) > 1: %if len(translations) > 1:
%for language in translations: %for language in sorted(translations):
<link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}"> <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
%endfor %endfor
%else: %else:
Expand All @@ -173,7 +173,7 @@ lang="${lang}">
</%def> </%def>


<%def name="html_translations()"> <%def name="html_translations()">
%for langname in translations.keys(): %for langname in sorted(translations):
%if langname != lang: %if langname != lang:
<li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
%endif %endif
Expand Down
3 changes: 2 additions & 1 deletion scripts/jinjify.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
["og: http://ogp.me/ns# \\", "og: http://ogp.me/ns#"], ["og: http://ogp.me/ns# \\", "og: http://ogp.me/ns#"],
["article: http://ogp.me/ns/article# \\", "article: http://ogp.me/ns/article#"], ["article: http://ogp.me/ns/article# \\", "article: http://ogp.me/ns/article#"],
["fb: http://ogp.me/ns/fb# \\", "fb: http://ogp.me/ns/fb#"], ["fb: http://ogp.me/ns/fb# \\", "fb: http://ogp.me/ns/fb#"],
['dir="rtl" \\', 'dir="rtl"'] ['dir="rtl" \\', 'dir="rtl"'],
['sorted(translations)', 'translations|sort'],
] ]


dumber_replacements = [ dumber_replacements = [
Expand Down

0 comments on commit d683518

Please sign in to comment.