From bce74f2821a3b5321bf3637533fd6897d51b31c8 Mon Sep 17 00:00:00 2001 From: alloystorm Date: Thu, 30 Mar 2023 18:29:23 +1100 Subject: [PATCH 1/2] Test --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index fc6beea04d65..c633c0aa6378 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -8,7 +8,7 @@ Free for personal and commercial use under the MIT license https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE --> - + {% include head.html %} {% include head/custom.html %} From 7d03168125d5a326bffacc027098b5a48c35f97e Mon Sep 17 00:00:00 2001 From: alloystorm Date: Thu, 30 Mar 2023 19:55:40 +1100 Subject: [PATCH 2/2] Use page locale --- _includes/author-profile.html | 8 ++-- _includes/breadcrumbs.html | 6 +-- _includes/category-list.html | 2 +- _includes/comments-providers/staticman.html | 10 ++--- .../comments-providers/staticman_v2.html | 10 ++--- _includes/comments.html | 42 +++++++++---------- _includes/feature_row | 2 +- _includes/footer.html | 8 ++-- _includes/masthead.html | 4 +- _includes/nav_list | 2 +- _includes/page__date.html | 4 +- _includes/page__hero.html | 6 +-- _includes/page__meta.html | 6 +-- _includes/paginator.html | 10 ++--- _includes/post_pagination.html | 8 ++-- _includes/search/algolia-search-scripts.html | 4 +- _includes/search/search_form.html | 8 ++-- _includes/seo.html | 4 +- _includes/skip-links.html | 6 +-- _includes/social-share.html | 10 ++--- _includes/tag-list.html | 2 +- _includes/toc | 2 +- _layouts/categories.html | 2 +- _layouts/home.html | 2 +- _layouts/posts.html | 2 +- _layouts/search.html | 4 +- _layouts/single.html | 12 +++--- _layouts/tags.html | 2 +- assets/js/lunr/lunr-en.js | 2 +- assets/js/lunr/lunr-gr.js | 2 +- docs/_docs/10-layouts.md | 4 +- docs/_layouts/default.html | 2 +- docs/_layouts/single.html | 12 +++--- test/_pages/collection-archive-grid.html | 2 +- 34 files changed, 106 insertions(+), 106 deletions(-) diff --git a/_includes/author-profile.html b/_includes/author-profile.html index e256ec7dd18f..6215f7fa270e 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -23,7 +23,7 @@

- + {% if site.search == true %} {% endif %} diff --git a/_includes/nav_list b/_includes/nav_list index a035a5bd7b15..dfda982b787c 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -3,7 +3,7 @@ diff --git a/_includes/post_pagination.html b/_includes/post_pagination.html index a93c6279763b..c86a36b66b04 100644 --- a/_includes/post_pagination.html +++ b/_includes/post_pagination.html @@ -1,14 +1,14 @@ {% if page.previous or page.next %} {% endif %} \ No newline at end of file diff --git a/_includes/search/algolia-search-scripts.html b/_includes/search/algolia-search-scripts.html index ba557c14f0d5..3daaa8dfd1eb 100644 --- a/_includes/search/algolia-search-scripts.html +++ b/_includes/search/algolia-search-scripts.html @@ -38,7 +38,7 @@

- +
{%- when "google" -%}
diff --git a/_includes/seo.html b/_includes/seo.html index c9d01e946a60..1ea58ed1c89e 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -47,7 +47,7 @@ {%- assign og_type = "website" -%} {%- endif -%} -{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %} +{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ site.data.ui-text[page.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %} {% if author.name %} @@ -58,7 +58,7 @@ {% endif %} - + diff --git a/_includes/skip-links.html b/_includes/skip-links.html index c2d52235e14f..ca1327aaf243 100644 --- a/_includes/skip-links.html +++ b/_includes/skip-links.html @@ -1,7 +1,7 @@ diff --git a/_includes/social-share.html b/_includes/social-share.html index 0b377982b268..02d7601d790d 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -1,11 +1,11 @@ diff --git a/_includes/tag-list.html b/_includes/tag-list.html index 5893ee4e4d46..af69b23be1f6 100644 --- a/_includes/tag-list.html +++ b/_includes/tag-list.html @@ -9,7 +9,7 @@ {% assign tags_sorted = page.tags | sort_natural %}

- {{ site.data.ui-text[site.locale].tags_label | default: "Tags:" }} + {{ site.data.ui-text[page.locale].tags_label | default: "Tags:" }} {% for tag_word in tags_sorted %} {% unless forloop.last %}, {% endunless %} diff --git a/_includes/toc b/_includes/toc index 6423ccdc72e1..4fafc5873422 100644 --- a/_includes/toc +++ b/_includes/toc @@ -1,6 +1,6 @@

- {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ + {{ site.data.ui-text[page.locale].back_to_top | default: 'Back to Top' }} ↑ {% endif %} {% endfor %} diff --git a/_layouts/home.html b/_layouts/home.html index 02e96eb81ca1..fa689db0d3b3 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -4,7 +4,7 @@ {{ content }} -

{{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}

+

{{ site.data.ui-text[page.locale].recent_posts | default: "Recent Posts" }}

{% if paginator %} {% assign posts = paginator.posts %} diff --git a/_layouts/posts.html b/_layouts/posts.html index 13fc707cf00a..42691c9ba055 100644 --- a/_layouts/posts.html +++ b/_layouts/posts.html @@ -25,6 +25,6 @@

{{ year.name }}

{% include archive-single.html type=entries_layout %} {% endfor %}
- {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ + {{ site.data.ui-text[page.locale].back_to_top | default: 'Back to Top' }} ↑ {% endfor %} diff --git a/_layouts/search.html b/_layouts/search.html index 9e661a364b04..4a84f2642efa 100644 --- a/_layouts/search.html +++ b/_layouts/search.html @@ -25,11 +25,11 @@

{{ page.title }}

{%- assign search_provider = site.search_provider | default: "lunr" -%} {%- case search_provider -%} {%- when "lunr" -%} - +
{%- when "google" -%}
- +
diff --git a/_layouts/single.html b/_layouts/single.html index bb16f536415c..2fd17b3657e7 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -41,18 +41,18 @@ {% if page.toc %} {% endif %} {{ content }} - {% if page.link %}
{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}
{% endif %} + {% if page.link %}
{{ site.data.ui-text[page.locale].ext_link_label | default: "Direct Link" }}
{% endif %}