jekyll-theme-chirpy 5.3.0 → 5.3.2

data/_includes/trending-tags.html

@@ -37,7 +37,7 @@
 
 {% if trending_tags.size > 0 %}
   <div id="access-tags">
-    <div class="panel-heading">{{- site.data.locales[lang].panel.trending_tags -}}</div>
+    <div class="panel-heading">{{- site.data.locales[site.lang].panel.trending_tags -}}</div>
     <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
 
     {% for tag_name in trending_tags %}

data/_includes/update-list.html

@@ -26,7 +26,7 @@
 {% if update_list.size > 0 %}
 
   <div id="access-lastmod" class="post">
-    <div class="panel-heading">{{- site.data.locales[lang].panel.lastmod -}}</div>
+    <div class="panel-heading">{{- site.data.locales[site.lang].panel.lastmod -}}</div>
     <ul class="post-content pl-0 pb-1 ml-1 mt-2">
       {% for item in update_list %}
         {% assign index = item | split: "::" | last | plus: 0 %}

data/_layouts/archives.html

@@ -3,15 +3,8 @@ layout: page
 # The Archives of posts.
 ---
 
-{% include lang.html %}
-
-{% if site.prefer_datetime_locale == 'en' or lang == 'en' %}
-  {% assign df_strftime_m = '%b' %}
-  {% assign df_dayjs_m = 'MMM' %}
-{% else %}
-  {% assign df_strftime_m = '/ %m' %}
-  {% assign df_dayjs_m = '/ MM' %}
-{% endif %}
+{% assign df_strftime_m = site.data.locales[site.lang].df.archives.strftime | default: '/ %m' %}
+{% assign df_dayjs_m = site.data.locales[site.lang].df.archives.dayjs | default: '/ MM' %}
 
 <div id="archives" class="pl-xl-3">
 

data/_layouts/categories.html

@@ -3,8 +3,6 @@ layout: page
 # All the Categories of posts
 ---
 
-{% include lang.html %}
-
 {% assign HEAD_PREFIX = "h_" %}
 {% assign LIST_PREFIX = "l_" %}
 
@@ -48,22 +46,22 @@ layout: page
           {% if sub_categories_size > 0 %}
             {{ sub_categories_size }}
             {% if sub_categories_size > 1 %}
-              {{ site.data.locales[lang].categories.category_measure.plural
-                | default: site.data.locales[lang].categories.category_measure }}
+              {{ site.data.locales[site.lang].categories.category_measure.plural
+                | default: site.data.locales[site.lang].categories.category_measure }}
             {% else %}
-              {{ site.data.locales[lang].categories.category_measure.singular
-                | default: site.data.locales[lang].categories.category_measure }}
+              {{ site.data.locales[site.lang].categories.category_measure.singular
+                | default: site.data.locales[site.lang].categories.category_measure }}
             {% endif %},
           {% endif %}
 
           {{ top_posts_size }}
 
           {% if top_posts_size > 1 %}
-            {{ site.data.locales[lang].categories.post_measure.plural
-              | default: site.data.locales[lang].categories.post_measure }}
+            {{ site.data.locales[site.lang].categories.post_measure.plural
+              | default: site.data.locales[site.lang].categories.post_measure }}
           {% else %}
-            {{ site.data.locales[lang].categories.post_measure.singular
-              | default: site.data.locales[lang].categories.post_measure }}
+            {{ site.data.locales[site.lang].categories.post_measure.singular
+              | default: site.data.locales[site.lang].categories.post_measure }}
           {% endif %}
         </span>
       </span>
@@ -99,11 +97,11 @@ layout: page
             {{ posts_size }}
 
             {% if posts_size > 1 %}
-              {{ site.data.locales[lang].categories.post_measure.plural
-                | default: site.data.locales[lang].categories.post_measure }}
+              {{ site.data.locales[site.lang].categories.post_measure.plural
+                | default: site.data.locales[site.lang].categories.post_measure }}
             {% else %}
-              {{ site.data.locales[lang].categories.post_measure.singular
-                | default: site.data.locales[lang].categories.post_measure }}
+              {{ site.data.locales[site.lang].categories.post_measure.singular
+                | default: site.data.locales[site.lang].categories.post_measure }}
             {% endif %}
           </span>
         </li>

data/_layouts/category.html

@@ -3,8 +3,6 @@ layout: page
 # The Category layout
 ---
 
-{% include lang.html %}
-
 <div id="page-category">
   <h1 class="pl-lg-2">
     <i class="far fa-folder-open fa-fw text-muted"></i>

data/_layouts/default.html

@@ -5,8 +5,6 @@ layout: compress
 
 <!DOCTYPE html>
 
-{% include lang.html %}
-
 {% include assets-origin.html %}
 
 {% capture prefer_mode %}
@@ -15,7 +13,8 @@ layout: compress
   {% endif %}
 {% endcapture %}
 
-<html lang="{{ site.lang }}"{{ prefer_mode }}>
+<!-- `site.alt_lang` can specify a language different from the UI -->
+<html lang="{{ site.alt_lang | default: site.lang }}"{{ prefer_mode }}>
 
   {% include head.html %}
 
@@ -27,17 +26,15 @@ layout: compress
 
     <div id="main-wrapper" class="d-flex justify-content-center">
       <div id="main" class="container pl-xl-4 pr-xl-4">
-
         {{ content }}
-
-        {% include footer.html %}
-
       </div>
 
       {% include search-results.html %}
 
     </div> <!-- #main-wrapper -->
 
+    {% include footer.html %}
+
     {% if page.mermaid %}
       {% include mermaid.html %}
     {% endif %}
@@ -57,9 +54,9 @@ layout: compress
           </button>
         </div>
         <div class="toast-body text-center pt-0">
-          <p class="pl-2 pr-2 mb-3">{{ site.data.locales[lang].notification.update_found }}</p>
+          <p class="pl-2 pr-2 mb-3">{{ site.data.locales[site.lang].notification.update_found }}</p>
           <button type="button" class="btn btn-primary" aria-label="Update">
-            {{ site.data.locales[lang].notification.update }}
+            {{ site.data.locales[site.lang].notification.update }}
           </button>
         </div>
       </div>

data/_layouts/home.html

@@ -3,8 +3,6 @@ layout: page
 # The Home page layout
 ---
 
-{% include lang.html %}
-
 {% assign pinned = site.posts | where: "pin", "true" %}
 {% assign default = site.posts | where_exp: "item", "item.pin != true and item.hidden != true" %}
 
@@ -79,7 +77,7 @@ layout: page
       {% if post.pin %}
       <div class="pin">
         <i class="fas fa-thumbtack fa-fw"></i>
-        <span>{{ site.data.locales[lang].post.pin_prompt }}</span>
+        <span>{{ site.data.locales[site.lang].post.pin_prompt }}</span>
       </div>
       {% endif %}
 

data/_layouts/page.html

@@ -2,14 +2,12 @@
 layout: default
 ---
 
-{% include lang.html %}
-
 {% include assets-origin.html %}
 
 <div class="row">
 
   <!-- core -->
-  <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pr-xl-4 pb-5">
+  <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pr-xl-4">
     <div class="post pl-1 pr-1 pl-md-2 pr-md-2">
 
     {% capture _content %}
@@ -20,9 +18,9 @@ layout: default
       {% endif %}
     {% endcapture %}
 
-    {% if page.collection == 'tabs' %}
+    {% if page.layout == 'page' or page.collection == 'tabs' %}
       {% assign tab_key = page.title | downcase %}
-      {% assign title = site.data.locales[lang].tabs[tab_key] | default: page.title %}
+      {% assign title = site.data.locales[site.lang].tabs[tab_key] | default: page.title %}
       <h1 class="dynamic-title">
         {{ title }}
       </h1>
@@ -55,7 +53,7 @@ layout: default
 <!-- tail -->
 {% if layout.tail_includes %}
 <div class="row">
-  <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 pl-3 pr-3 pr-xl-4">
+  <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 pl-3 pr-3 pr-xl-4 mt-5">
     {% for _include in layout.tail_includes %}
       {% assign _include_path = _include | append: '.html' %}
       {% include {{ _include_path }} %}

data/_layouts/post.html

@@ -9,32 +9,30 @@ tail_includes:
   - comments
 ---
 
-{% include lang.html %}
-
 <h1 data-toc-skip>{{ page.title }}</h1>
 
 <div class="post-meta text-muted">
     <!-- published date -->
     <span>
-      {{ site.data.locales[lang].post.posted }}
+      {{ site.data.locales[site.lang].post.posted }}
       {% include datetime.html date=page.date tooltip=true %}
     </span>
 
     <!-- lastmod date -->
     {% if page.last_modified_at %}
     <span>
-      {{ site.data.locales[lang].post.updated }}
+      {{ site.data.locales[site.lang].post.updated }}
       {% include datetime.html date=page.last_modified_at tooltip=true %}
     </span>
     {% endif %}
 
-  {% if page.image.path %}
+  {% if page.image %}
     {% capture bg %}
       {% unless page.image.no_bg %}{{ 'bg' }}{% endunless %}
     {% endcapture %}
 
     <div class="mt-3 mb-3">
-      <img src="{{ page.image.path }}" class="preview-img {{ bg | strip }}"
+      <img src="{{ page.image.path | default: page.image }}" class="preview-img {{ bg | strip }}"
         alt="{{ page.image.alt | default: "Preview Image" }}"
 
       {% if page.image.width %}
@@ -65,7 +63,7 @@ tail_includes:
         {% assign authors = page.authors %}
       {% endif %}
 
-      {{ site.data.locales[lang].post.written_by }}
+      {{ site.data.locales[site.lang].post.written_by }}
 
       <em>
       {% if authors %}
@@ -86,7 +84,7 @@ tail_includes:
         <em id="pv" class="pageviews">
           <i class="fas fa-spinner fa-spin fa-fw"></i>
         </em>
-        {{ site.data.locales[lang].post.pageview_measure }}
+        {{ site.data.locales[site.lang].post.pageview_measure }}
       </span>
       {% endif %}
 
@@ -132,15 +130,15 @@ tail_includes:
     d-flex justify-content-between align-items-center mt-3 pt-5 pb-2">
     <div class="license-wrapper">
 
-      {% if site.data.locales[lang].copyright.license.template %}
+      {% if site.data.locales[site.lang].copyright.license.template %}
 
         {% capture _replacement %}
-        <a href="{{ site.data.locales[lang].copyright.license.link }}">
-          {{ site.data.locales[lang].copyright.license.name }}
+        <a href="{{ site.data.locales[site.lang].copyright.license.link }}">
+          {{ site.data.locales[site.lang].copyright.license.name }}
         </a>
         {% endcapture %}
 
-        {{ site.data.locales[lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
+        {{ site.data.locales[site.lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
 
       {% endif %}
     </div>

data/_layouts/tag.html

@@ -3,8 +3,6 @@ layout: page
 # The layout for Tag page
 ---
 
-{% include lang.html %}
-
 <div id="page-tag">
   <h1 class="pl-lg-2">
     <i class="fa fa-tag fa-fw text-muted"></i>