jekyll-theme-chirpy 4.0.2 → 4.1.0

data/_includes/no-zero-date.html

@@ -0,0 +1,13 @@
+{% comment %}
+  Remove the zero padding from a month/day string
+{% endcomment %}
+
+{% assign ret = include.date_str %}
+{% assign _first_chat = ret | slice: 0 %}
+
+{% if _first_chat == '0' %}
+  {% assign _last_idx = ret.size | minus: 1 %}
+  {% assign ret = ret | slice: 1, _last_idx %}
+{% endif %}
+
+{{ ret | replace: ' 0', ' ' }}

data/_includes/panel.html

@@ -11,7 +11,7 @@
   {% if update_list.size > 0 %}
 
     <div id="access-lastmod" class="post">
-      <span>{{- site.data.label.panel.lastmod | default: 'Recent Update' -}}</span>
+      <span>{{- site.data.locales[site.lang].panel.lastmod | default: 'Recent Update' -}}</span>
       <ul class="post-content pl-0 pb-1 ml-1 mt-2">
 
       {% for item in update_list %}
@@ -30,7 +30,7 @@
 
   {% if trending_tags.size > 0 %}
     <div id="access-tags">
-      <span>{{- site.data.label.panel.trending_tags | default: 'Trending Tags' -}}</span>
+      <span>{{- site.data.locales[site.lang].panel.trending_tags | default: 'Trending Tags' -}}</span>
       <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
 
       {% for tag_name in trending_tags %}
@@ -48,7 +48,7 @@
     <script src="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc@1.0.1/dist/bootstrap-toc.min.js"></script>
     <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
       <span class="pl-3 pt-2 mb-2">
-      {{- site.data.label.panel.toc | default: 'Contents' -}}
+      {{- site.data.locales[site.lang].panel.toc | default: 'Contents' -}}
       </span>
       <nav id="toc" data-toggle="toc"></nav>
     </div>

data/_includes/post-nav.html

@@ -5,24 +5,24 @@
 <div class="post-navigation d-flex justify-content-between">
   {% if page.previous.url %}
   <a href="{{ site.baseurl }}{{ page.previous.url }}" class="btn btn-outline-primary"
-    prompt="{{ site.data.label.post.button.previous | default: 'previous' }}">
+    prompt="{{ site.data.locales[site.lang].post.button.previous | default: 'previous' }}">
     <p>{{ page.previous.title }}</p>
   </a>
   {% else %}
   <span class="btn btn-outline-primary disabled"
-    prompt="{{ site.data.label.post.button.previous | default: 'previous' }}">
+    prompt="{{ site.data.locales[site.lang].post.button.previous | default: 'previous' }}">
     <p>-</p>
   </span>
   {% endif %}
 
   {% if page.next.url %}
   <a href="{{ site.baseurl }}{{page.next.url}}" class="btn btn-outline-primary"
-    prompt="{{ site.data.label.post.button.next | default: 'next' }}">
+    prompt="{{ site.data.locales[site.lang].post.button.next | default: 'next' }}">
     <p>{{ page.next.title }}</p>
   </a>
   {% else %}
   <span class="btn btn-outline-primary disabled"
-    prompt="{{ site.data.label.post.button.next | default: 'next' }}">
+    prompt="{{ site.data.locales[site.lang].post.button.next | default: 'next' }}">
     <p>-</p>
   </span>
   {% endif %}

data/_includes/post-paginator.html

@@ -2,13 +2,14 @@
   The paginator for post list on HomgPage.
 -->
 
-<ul class="pagination mt-4 mb-0 pl-lg-2">
+<ul class="pagination align-items-center mt-4 mb-0 pl-lg-2">
   <!-- left arrow -->
   {% if paginator.previous_page %}
     {% assign prev_url = paginator.previous_page_path | relative_url %}
   {% else %}
     {% assign prev_url = "#" %}
   {% endif %}
+
   <li class="page-item {% unless paginator.previous_page %}disabled{% endunless %}">
     <a class="page-link btn-box-shadow" href="{{ prev_url }}" aria-label="previous-page">
       <i class="fas fa-angle-left"></i>
@@ -65,12 +66,19 @@
 
   {% endfor %}
 
+  <!-- mobile pagination -->
+  <li class="page-index align-middle">
+    <span>{{ paginator.page }}</span>
+    <span class="text-muted">/ {{ paginator.total_pages }}</span>
+  </li>
+
   <!-- right arrow -->
   {% if paginator.next_page_path %}
     {% assign next_url = paginator.next_page_path | relative_url %}
   {% else %}
     {% assign next_url = "#" %}
   {% endif %}
+
   <li class="page-item {% unless paginator.next_page_path %}disabled{% endunless %}">
     <a class="page-link btn-box-shadow" href="{{ next_url }}" aria-label="next-page">
       <i class="fas fa-angle-right"></i>

data/_includes/post-sharing.html

@@ -3,7 +3,7 @@
 -->
 
 <div class="share-wrapper">
-  <span class="share-label text-muted mr-1">{{ site.data.label.post.share | default: 'Share' }}</span>
+  <span class="share-label text-muted mr-1">{{ site.data.locales[site.lang].post.share | default: 'Share' }}</span>
   <span class="share-icons">
     {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
     {% assign url = page.url | absolute_url %}
@@ -16,8 +16,10 @@
         </a>
     {% endfor %}
 
-    <i class="fa-fw fas fa-link small" onclick="copyLink()"
-        data-toggle="tooltip" data-placement="top" title="Copy link"></i>
+    <i class="fa-fw fas fa-link small" onclick="copyLink('', '{{ site.data.locales[site.lang].post.button.copy.succeed }}')"
+        data-toggle="tooltip" data-placement="top"
+        title="{{ site.data.locales[site.lang].post.button.copy.title }}">
+    </i>
 
   </span>
 </div>

data/_includes/read-time.html

@@ -1,9 +1,11 @@
 <!--
   Calculate the post's reading time, and display the word count in tooltip
  -->
+
 {% assign words = include.content | strip_html | number_of_words: "auto" %}
 
 <!-- words per minute  -->
+
 {% assign wpm = 180 %}
 {% assign min_time = 1 %}
 
@@ -13,7 +15,15 @@
   {% assign read_time = min_time %}
 {% endunless %}
 
+{% capture read_prompt %}
+  {{- site.data.locales[site.lang].post.read_time.prompt | default: "read" -}}
+{% endcapture %}
+
 <!-- return element -->
-<span class="readtime" data-toggle="tooltip" data-placement="bottom" title="{{ words }} words">
-  {{- read_time -}}{{" "}}{{- site.data.label.read_time_unit | default: "min" -}}
+<span class="readtime" data-toggle="tooltip" data-placement="bottom"
+  title="{{ words }} {{ site.data.locales[site.lang].post.words | default: "words" }}">
+  {{- read_time -}}{{" "}}{{- site.data.locales[site.lang].post.read_time.unit | default: "min" -}}
+  {%- if include.prompt -%}
+    {% unless site.lang contains 'zh' %}{{" "}}{% endunless %}{{ read_prompt }}
+  {%- endif -%}
 </span>

data/_includes/refactor-content.html

@@ -8,6 +8,7 @@
   In order to allow a wide table to scroll horizontally,
   we suround the markdown table with `<div class="table-wrapper">` and `</div>`
 -->
+
 {% if _content contains '<table>' %}
   {% assign _content = _content
     | replace: '<table>', '<div class="table-wrapper"><table>'
@@ -21,6 +22,7 @@
   https://github.com/penibelst/jekyll-compress-html/issues/101
   https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901
 -->
+
 {% if _content contains '<pre class="highlight">' %}
   {% assign _content = _content
     | replace: '<div class="highlight"><pre class="highlight"><code', '<div class="highlight"><code'
@@ -29,14 +31,20 @@
 {% endif %}
 
 <!-- Add attribute 'hide-bullet' to the checkbox list -->
+
 {% if _content contains '<li class="task-list-item"><' %}
   {% assign _content = _content
     | replace: '"task-list-item"><', '"task-list-item" hide-bullet><'
   %}
 {% endif %}
 
+
+<!-- images -->
+
 {% if _content contains '<img src="' %}
 
+  <!-- add CDN prefix if it exists -->
+
   {% if site.img_cdn != '' %}
     {% assign img_path_replacement = '<img src="' | append: site.img_cdn | append: '/' %}
   {% else %}
@@ -46,16 +54,77 @@
   {% assign _content = _content | replace: '<img src="/', img_path_replacement %}
 
   <!-- lazy-load images <https://github.com/ApoorvSaxena/lozad.js#usage> -->
-  {% assign img_placehodler
-    = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' %}
 
-  {% assign lozad_replacement = '<img src="'
-    | append: img_placehodler
-    | append: '" data-src="' %}
+  {% assign _content = _content | replace: '<img src="', '<img data-proofer-ignore data-src="' %}
+
+  <!-- add image placehoder to prevent layout reflow -->
+
+  {% assign _img_content = nil %}
+
+  {% assign _images = _content | split: '<img ' %}
+
+  {% for _img in _images %}
+    {% if forloop.first %}
+      {% assign _img_content = _img %}
+      {% continue %}
+    {% endif %}
+
+    {% assign _width = nil %}
+    {% assign _height = nil %}
+    {% assign _attrs = _img | split: '>' | first | split: ' ' %}
+
+    {% for _attr in _attrs %}
+      {% capture _key %}{{ _attr | split: '=' | first }}{% endcapture %}
+      {% capture _value %}{{ _attr | split: '=' | last | replace: '"', '' }}{% endcapture %}
+
+      {% case _key %}
+        {% when 'width' %}
+          {% assign _width = _value %}
+        {% when 'height' %}
+          {% assign _height = _value %}
+      {% endcase %}
 
-  {% assign _content = _content | replace: '<img src="', lozad_replacement %}
+      {% if _width and _height %}
+        {% capture _svg %}data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 {{_width}} {{_height}}'%3E%3C/svg%3E{% endcapture %}
+        {% assign _img_content = _img_content | append: '<img src="' | append: _svg | append: '" ' | append: _img %}
+        {% break %}
+      {% endif %}
+
+    {% endfor %}
+
+    {% unless _width and _height %}
+      {% assign _img_content = _img_content | append: '<img ' | append: _img %}
+    {% endunless %}
+
+  {% endfor %}
+
+  {% assign _content = _img_content %}
 
 {% endif %}
 
+<!-- Add lang-badge for code snippets -->
+
+{% if _content contains '<div class="language-' %}
+  {% assign _code_splits = _content | split: '<div class="language-' %}
+  {% assign _new_content = nil %}
+
+  {% for _snippet in _code_splits %}
+    {% if forloop.first %}
+      {% assign _new_content = _snippet %}
+    {% else %}
+      {% assign _lang = _snippet | split: ' ' | first %}
+      {% capture _tag_head %}<div lang="{{_lang}}" class="language-{% endcapture %}
+      {% assign _new_content = _new_content | append: _tag_head | append: _snippet %}
+    {% endif %}
+  {% endfor %}
+
+  {% if _new_content %}
+    {% assign _content = _new_content %}
+  {% endif %}
+
+{% endif %}
+
+
 <!-- return -->
+
 {{ _content }}

data/_includes/related-posts.html

@@ -81,7 +81,7 @@
 {% if index_list.size > 0 %}
   <div id="related-posts" class="mt-5 mb-2 mb-sm-4">
     <h3 class="pt-2 mt-1 mb-4 ml-1"
-      data-toc-skip>{{ site.data.label.post.relate_posts | default: 'Further Reading' }}</h3>
+      data-toc-skip>{{ site.data.locales[site.lang].post.relate_posts | default: 'Further Reading' }}</h3>
     <div class="card-deck mb-4">
     {% for entry in index_list %}
       {% assign index = entry | plus: 0 %}

data/_includes/search-results.html

@@ -4,7 +4,7 @@
 <div id="search-result-wrapper" class="d-flex justify-content-center unloaded">
   <div class="col-12 col-sm-11 post-content">
     <div id="search-hints">
-      <h4 class="text-muted mb-4">{{ site.data.label.panel.trending_tags | default: 'Trending Tags' }}</h4>
+      <h4 class="text-muted mb-4">{{ site.data.locales[site.lang].panel.trending_tags | default: 'Trending Tags' }}</h4>
 
       {% include trending-tags.html %}
 

data/_includes/sidebar.html

@@ -2,8 +2,7 @@
   The Side Bar
 -->
 
-<div id="sidebar" class="d-flex flex-column align-items-end">
-
+<div id="sidebar" class="d-flex flex-column align-items-end" lang="{{lang}}">
   <div class="profile-wrapper text-center">
     <div id="avatar">
       <a href="{{ '/' | relative_url }}" alt="avatar" class="mx-auto">
@@ -21,19 +20,19 @@
     </div>
 
     <div class="site-title mt-3">
-      <a href="{{ '/' | relative_url }}">{{- site.title -}}</a>
+      <a href="{{ '/' | relative_url }}">{{ site.title }}</a>
     </div>
-
-    <div class="site-subtitle font-italic">{{- site.tagline -}}</div>
+    <div class="site-subtitle font-italic">{{ site.tagline }}</div>
 
   </div><!-- .profile-wrapper -->
 
   <ul class="w-100">
+
     <!-- home -->
     <li class="nav-item{% if page.layout == 'home' %}{{ " active" }}{% endif %}">
       <a href="{{ '/' | relative_url }}" class="nav-link">
         <i class="fa-fw fas fa-home ml-xl-3 mr-xl-3 unloaded"></i>
-        <span>{{ "HOME" }}</span>
+        <span>{{ site.data.locales[site.lang].tabs.home | default: "home" | upcase }}</span>
       </a>
     </li>
     <!-- the real tabs -->
@@ -41,7 +40,9 @@
     <li class="nav-item{% if tab.url == page.url %}{{ " active" }}{% endif %}">
       <a href="{{ tab.url | relative_url }}" class="nav-link">
         <i class="fa-fw {{ tab.icon }} ml-xl-3 mr-xl-3 unloaded"></i>
-        <span>{{ tab.title | upcase }}</span>
+        {% capture tab_name %}{{ tab.url | split: '/' }}{% endcapture %}
+
+        <span>{{ site.data.locales[site.lang].tabs.[tab_name] | default: tab_name | upcase }}</span>
       </a>
     </li> <!-- .nav-item -->
     {% endfor %}

data/_includes/timeago.html

@@ -3,29 +3,25 @@
   See: /assets/js/_utils/timeage.js
 -->
 
-{% assign tooltip_df = site.data.date_format.tooltip | default: '%a, %b %e, %Y, %l:%M %p %z' %}
-{% assign post_long_df = site.data.date_format.post.long | default: '%b %e, %Y' %}
-{% assign post_short_df = site.data.date_format.post.short | default: '%b %e' %}
+{% assign tooltip_df = site.data.locales[site.lang].date_format.tooltip | default: '%a, %b %e, %Y, %l:%M %p %z' %}
+{% assign post_long_df = site.data.locales[site.lang].date_format.post.long | default: '%b %e, %Y' %}
+{% assign post_short_df = site.data.locales[site.lang].date_format.post.short | default: '%b %e' %}
 
+{% if include.preposition %}
+  {{ include.preposition }}
+{% endif %}
 <span class="timeago {% if include.class %}{{ include.class }}{% endif %}"
   {% if include.tooltip %}
     data-toggle="tooltip"
     data-placement="bottom"
     title="{{ include.date | date: tooltip_df }}"
-  {% endif %}
-
-  {% if include.prefix %}prefix="{{ include.prefix }} "{% endif%}
-  {% if include.prep %}prep="{{ include.prep }}"{% endif %} >
-
-  {% assign this_year = site.time | date: "%Y" %}
-  {% assign post_year = include.date | date: "%Y" %}
-
-  {% if post_year == this_year %}
+  {% endif %}>
+  {%- assign this_year = site.time | date: "%Y" -%}
+  {%- assign post_year = include.date | date: "%Y" -%}
+  {%- if post_year == this_year -%}
     {{ include.date | date: post_short_df }}
-  {% else %}
+  {%- else -%}
     {{ include.date | date: post_long_df }}
-  {% endif %}
-
+  {%- endif -%}
   <i class="unloaded">{{ include.date | date_to_xmlschema }}</i>
-
 </span>

data/_includes/topbar.html

@@ -8,33 +8,38 @@
 
     {% assign paths = page.url | split: '/' %}
 
-    {% if paths.size == 0 %}
+    {% if paths.size == 0 or page.layout == 'home' %}
       <!-- index page -->
-      <span>{{ 'Posts' }}</span>
+      <span>{{ site.data.locales[site.lang].tabs.home | default: 'home' | capitalize }}</span>
+
     {% else %}
 
       {% for item in paths %}
 
         {% if forloop.first %}
-          {% unless page.layout == 'post' %}
           <span>
-            <a href="{{ '/' | relative_url }}">{{ 'Home' }}</a>
+            <a href="{{ '/' | relative_url }}">
+              {{ site.data.locales[site.lang].tabs.home | default: 'home' | capitalize }}
+            </a>
           </span>
-          {% endunless %}
 
         {% elsif forloop.last %}
-          <span>{{ page.title }}</span>
 
-        {% else %}
-        <span>
-          {% assign url = item %}
-          {% if item == 'posts' and page.layout == 'post' %}
-            {% assign url = '/' %}
+          {% if page.collection == 'tabs' %}
+            <span>{{ site.data.locales[site.lang].tabs[item] | default: page.title }}</span>
+          {% else %}
+            <span>{{ page.title }}</span>
           {% endif %}
-          <a href="{{ url | relative_url }}">
-            {{ item | capitalize }}
-          </a>
-        </span>
+
+        {% else %}
+
+          {% unless page.layout == 'post' %}
+            <span>
+              <a href="{{ item | relative_url }}">
+                {{ site.data.locales[site.lang].tabs[item] | default: page.title }}
+              </a>
+            </span>
+          {% endunless %}
 
         {% endif %}
 
@@ -48,11 +53,12 @@
 
     <div id="topbar-title">
       {% if page.layout == 'home' %}
-        {{- site.title -}}
-      {% elsif page.dynamic_title %}
-        {{- page.title -}}
+        {{- site.data.locales[site.lang].title | default: site.title -}}
+      {% elsif page.collection == 'tabs' %}
+        {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
+        {{- site.data.locales[site.lang].tabs[tab_key] | default: page.title -}}
       {% else %}
-        {{- page.layout | capitalize -}}
+        {{- site.data.locales[site.lang].layout[page.layout] | default: page.layout | capitalize -}}
       {% endif %}
     </div>
 
@@ -60,10 +66,10 @@
     <span id="search-wrapper" class="align-items-center">
       <i class="fas fa-search fa-fw"></i>
       <input class="form-control" id="search-input" type="search"
-        aria-label="search" autocomplete="off" placeholder="{{ site.data.label.search_hint | default: 'Search' }}...">
+        aria-label="search" autocomplete="off" placeholder="{{ site.data.locales[site.lang].search.hint | default: 'Search' | capitalize }}...">
       <i class="fa fa-times-circle fa-fw" id="search-cleaner"></i>
     </span>
-    <span id="search-cancel" >Cancel</span>
+    <span id="search-cancel" >{{ site.data.locales[site.lang].search.cancel | default: 'Cancel' }}</span>
   </div>
 
 </div>