From 0ae8c972bbafff196971a9ceaffb454927533d83 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 17 Feb 2020 11:18:09 +0100 Subject: [PATCH 1/3] Specify a template for zh-TW posts --- blog/content/second-edition/posts/_index.zh-TW.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 blog/content/second-edition/posts/_index.zh-TW.md diff --git a/blog/content/second-edition/posts/_index.zh-TW.md b/blog/content/second-edition/posts/_index.zh-TW.md new file mode 100644 index 00000000..d9da15d1 --- /dev/null +++ b/blog/content/second-edition/posts/_index.zh-TW.md @@ -0,0 +1,7 @@ ++++ +title = "Posts" +sort_by = "weight" +insert_anchor_links = "left" +render = false +page_template = "second-edition/page.html" ++++ From 127f446856d3aba0dfb7e3dcb159bd612d1f8a01 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 17 Feb 2020 11:20:57 +0100 Subject: [PATCH 2/3] Don't show 'not translated yet' for default language --- blog/templates/macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/templates/macros.html b/blog/templates/macros.html index 384357c7..f98cc5f0 100644 --- a/blog/templates/macros.html +++ b/blog/templates/macros.html @@ -12,7 +12,7 @@ {{ post.summary | safe}} read more » - {% if lang and not_translated %} + {% if lang and not_translated and lang != config.default_language %} From 0e3635f98b56ddf68d67e237057585c01b14ed20 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 17 Feb 2020 11:22:49 +0100 Subject: [PATCH 3/3] Remove some excessive newlines from generated HTML --- blog/templates/macros.html | 20 ++++++++++---------- blog/templates/second-edition/index.html | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/blog/templates/macros.html b/blog/templates/macros.html index f98cc5f0..fc265e96 100644 --- a/blog/templates/macros.html +++ b/blog/templates/macros.html @@ -1,22 +1,22 @@ {% macro post_link(page) %}
- {% set translations = page.translations | filter(attribute="lang", value=lang) %} - {% if translations %} - {% set post = get_page(path = translations.0.path) %} - {% else %} - {% set post = page %} - {% set not_translated = true %} - {% endif %} + {% set translations = page.translations | filter(attribute="lang", value=lang) -%} + {%- if translations -%} + {%- set post = get_page(path = translations.0.path) -%} + {%- else -%} + {%- set post = page -%} + {%- set not_translated = true -%} + {%- endif -%}

{{ post.title }}

- {{ post.summary | safe}} + {{ post.summary | safe }} read more » - {% if lang and not_translated and lang != config.default_language %} + {%- if lang and not_translated and lang != config.default_language -%} - {% endif %} + {%- endif -%}
{% endmacro post_link %} diff --git a/blog/templates/second-edition/index.html b/blog/templates/second-edition/index.html index 6c7a89bb..57e406aa 100644 --- a/blog/templates/second-edition/index.html +++ b/blog/templates/second-edition/index.html @@ -24,21 +24,21 @@
-{% set chapter = "none" %} -{% for post in posts %} - {% if post.extra["chapter"] %} - {% if post.extra["chapter"] != chapter %} +{%- set chapter = "none" -%} +{%- for post in posts -%} + {%- if post.extra["chapter"] -%} + {%- if post.extra["chapter"] != chapter -%} {# Begin new chapter #} - {% set_global chapter = post.extra["chapter"] %} + {%- set_global chapter = post.extra["chapter"] -%}
- {% endif %} - {% endif %} + {%- endif -%} + {%- endif -%} {{ macros::post_link(page=post) }} -{% endfor %} +{%- endfor -%}