Merge pull request #7 from ivan-penchev/release_5.2

Release 5.2
ivan-penchev · Jun 13, 2022 · 3bbfee7 · 3bbfee7
2 parents 622481f + fe1f0f0
commit 3bbfee7
Show file tree

Hide file tree

Showing 47 changed files with 482 additions and 310 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,16 @@
+# Set default behavior to automatically normalize line endings.
+* text=auto
+
+# Force bash scripts to always use LF line endings so that if a repo is accessed
+# in Unix via a file share from Windows, the scripts will work.
+*.sh text eol=lf
+
+# Force batch scripts to always use CRLF line endings so that if a repo is accessed
+# in Windows via a file share from Linux, the scripts will work.
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.ico binary
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
- #hidden files
+# hidden files
 .*
 !.git*
 !.editorconfig

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/lib"]
+	path = assets/lib
+	url = https://github.com/cotes2020/chirpy-static-assets.git
diff --git a/.nojekyll b/.nojekyll
@@ -0,0 +1 @@
+
diff --git a/_config.yml b/_config.yml
@@ -118,6 +118,9 @@ assets:
     # only works if `assets.self_host.enabled` is 'true'
     env:          # [development|production]
 
+pwa:
+  enabled: true   # the option for PWA feature
+
 paginate: 10
 
 markdown: kramdown
@@ -201,4 +204,4 @@ jekyll-archives:
     tag: tag
   permalinks:
     tag: /tags/:name/
-    category: /categories/:name/
+    category: /categories/:name/
diff --git a/_data/locales/en.yml b/_data/locales/en.yml
@@ -20,7 +20,7 @@ tabs:
 search:
   hint: search
   cancel: Cancel
-  no_results: Oops! No result founds.
+  no_results: Oops! No results found.
 
 panel:
   lastmod: Recently Updated
@@ -45,6 +45,10 @@ meta: Powered by :PLATFORM with :THEME theme.
 not_found:
   statment: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.
 
+notification:
+  update_found: A new version of content is available.
+  update: Update
+
 # ----- Posts related labels -----
 
 post:
@@ -71,5 +75,9 @@ post:
 
 # categories page
 categories:
-  category_measure: categories
-  post_measure: posts
+  category_measure:
+    singular: category
+    plural: categories
+  post_measure:
+    singular: post
+    plural: posts
diff --git a/_data/locales/es-ES.yml b/_data/locales/es-ES.yml
@@ -45,6 +45,10 @@ meta: Hecho con :PLATFORM usando el tema :THEME.
 not_found:
   statment: Lo sentimos, hemos perdido esa URL o apunta a algo que no existe.
 
+notification:
+  update_found: Hay una nueva versión de contenido disponible.
+  update: Actualizar
+
 # ----- Posts related labels -----
 
 post:

diff --git a/_data/locales/fr-FR.yml b/_data/locales/fr-FR.yml
@@ -45,6 +45,10 @@ meta: Propulsé par :PLATFORM avec le thème :THEME
 not_found:
   statment: Désolé, nous avons égaré cette URL ou elle pointe vers quelque chose qui n'existe pas.
 
+notification:
+  update_found: Une nouvelle version du contenu est disponible.
+  update: Mise à jour
+
 # ----- Posts related labels -----
 
 post:

diff --git a/_data/locales/hu-HU.yml b/_data/locales/hu-HU.yml
@@ -0,0 +1,81 @@
+# The layout text of site
+
+# ----- Commons label -----
+
+layout:
+  post: Bejegyzés
+  category: Kategória
+  tag: Címke
+
+# The tabs of sidebar
+tabs:
+  # format: <filename_without_extension>: <value>
+  home: Kezdőlap
+  categories: Kategóriák
+  tags: Címkék
+  archives: Archívum
+  about: Rólam
+
+# the text displayed in the search bar & search results
+search:
+  hint: keresés
+  cancel: Mégse
+  no_results: Oops! Nincs találat a keresésre.
+
+panel:
+  lastmod: Legutóbb frissítve
+  trending_tags: Népszerű Címkék
+  toc: Tartalom
+  links: Blog linkek
+
+copyright:
+  # Shown at the bottom of the post
+  license:
+    template: A bejegyzés :LICENSE_NAME licenccel rendelkezik.
+    name: CC BY 4.0
+    link: https://creativecommons.org/licenses/by/4.0/
+
+  # Displayed in the footer
+  brief: Néhány jog fenntartva.
+  verbose: >-
+   Az oldalon található tartalmak 
+   Creative Commons Attribution 4.0 International (CC BY 4.0) licenccel rendelkeznek, 
+   hacsak másképp nincs jelezve.
+
+meta: Készítve :PLATFORM motorral :THEME témával.
+
+not_found:
+  statment: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat.
+
+notification:
+  update_found: Elérhető a tartalom új verziója.
+  update: Frissítés
+
+# ----- Posts related labels -----
+
+post:
+  written_by: Szerző
+  posted: Létrehozva
+  updated: Frissítve
+  words: szó
+  pageview_measure: látogató
+  read_time:
+    unit: perc
+    prompt: elolvasni
+  relate_posts: További olvasnivaló
+  share: Megosztás
+  button:
+    next: Újabb
+    previous: Régebbi
+    copy_code:
+      succeed: Másolva!
+    share_link:
+      title: Link másolása
+      succeed: Link sikeresen másolva!
+  # pinned prompt of posts list on homepage
+  pin_prompt: Kitűzve
+
+# categories page
+categories:
+  category_measure: kategória
+  post_measure: bejegyzés
diff --git a/_data/locales/id-ID.yml b/_data/locales/id-ID.yml
@@ -45,6 +45,10 @@ meta: Didukung oleh :PLATFORM dengan tema :THEME.
 not_found:
   statment: Maaf, kami gagal menemukan URL itu atau memang mengarah ke sesuatu yang tidak ada.
 
+notification:
+  update_found: Versi konten baru tersedia.
+  update: Perbarui
+
 # ----- Posts related labels -----
 
 post:

diff --git a/_data/locales/ko-KR.yml b/_data/locales/ko-KR.yml
@@ -45,6 +45,10 @@ meta: Powered by :PLATFORM with :THEME theme.
 not_found:
   statment: 해당 URL은 존재하지 않습니다.
 
+notification:
+  update_found: 새 버전의 콘텐츠를 사용할 수 있습니다.
+  update: 업데이트
+
 # ----- Posts related labels -----
 
 post:

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,9 +1,7 @@
-<!--
-  The Footer
--->
+<!-- The Footer -->
 
-<footer class="d-flex w-100 justify-content-center">
-  <div class="d-flex justify-content-between align-items-center text-muted">
+<footer class="row pl-3 pr-3">
+  <div class="col-12 d-flex justify-content-between align-items-center text-muted pl-0 pr-0">
     <div class="footer-left">
       <p class="mb-0">
         © {{ 'now' | date: "%Y" }}
@@ -33,5 +31,6 @@
       </p>
     </div>
 
-  </div> <!-- div.d-flex -->
+  </div>
+
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -68,7 +68,7 @@
       <link rel="dns-prefetch" href="{{ cdn.url }}" {{ cdn.args }}>
     {% endfor %}
 
-    <link rel="stylesheet" href="{{ site.data.assets[origin].webfonts }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].webfonts | relative_url }}">
 
   {% endif %}
 
@@ -90,25 +90,25 @@
   {% endif %}
 
   <!-- Bootstrap -->
-  <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap.css }}">
+  <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap.css | relative_url}}">
 
   <!-- Font Awesome -->
-  <link rel="stylesheet" href="{{ site.data.assets[origin].fontawesome.css }}">
+  <link rel="stylesheet" href="{{ site.data.assets[origin].fontawesome.css | relative_url }}">
 
   <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
 
   {% if site.toc and page.toc %}
-    <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap-toc.css }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap-toc.css | relative_url }}">
   {% endif %}
 
   {% if page.layout == 'page' or page.layout == 'post' %}
     <!-- Manific Popup -->
-    <link rel="stylesheet" href="{{ site.data.assets[origin].magnific-popup.css }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].magnific-popup.css | relative_url }}">
   {% endif %}
 
   <!-- JavaScript -->
 
-  <script src="{{ site.data.assets[origin].jquery.js }}"></script>
+  <script src="{{ site.data.assets[origin].jquery.js | relative_url }}"></script>
 
   {% unless site.theme_mode %}
     {% include mode-toggle.html %}

diff --git a/_includes/js-selector.html b/_includes/js-selector.html
@@ -7,7 +7,7 @@
 {% if page.layout == 'post' %}
   {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %}
     <!-- pv-report needs countup.js -->
-    <script async src="{{ site.data.assets[origin].countup.js }}"></script>
+    <script async src="{{ site.data.assets[origin].countup.js | relative_url }}"></script>
     <script defer src="{{ '/assets/js/dist/pvreport.min.js' | relative_url }}"></script>
   {% endif %}
 {% endif %}
@@ -79,18 +79,22 @@
     }
   };
   </script>
-  <script src="{{ site.data.assets[origin].polyfill.js }}"></script>
-  <script id="MathJax-script" async src="{{ site.data.assets[origin].mathjax.js }}">
+  <script src="{{ site.data.assets[origin].polyfill.js | relative_url }}"></script>
+  <script id="MathJax-script" async src="{{ site.data.assets[origin].mathjax.js | relative_url }}">
   </script>
 {% endif %}
 
 <!-- commons -->
 
-<script src="{{ site.data.assets[origin].bootstrap.js }}"></script>
+<script src="{{ site.data.assets[origin].bootstrap.js | relative_url }}"></script>
 
 {% if jekyll.environment == 'production' %}
   <!-- PWA -->
-  <script defer src="{{ '/app.js' | relative_url }}"></script>
+  {% if site.pwa.enabled %}
+    <script defer src="{{ '/app.js' | relative_url }}"></script>
+  {% else %}
+    <script defer src="{{ '/unregister.js' | relative_url }}"></script>
+  {% endif %}
 
   <!-- GA -->
   {% if site.google_analytics.id != empty and site.google_analytics.id %}

diff --git a/_includes/mermaid.html b/_includes/mermaid.html
@@ -2,7 +2,7 @@
   mermaid-js loader
 -->
 
-<script src="{{ site.data.assets[origin].mermaid.js }}"></script>
+<script src="{{ site.data.assets[origin].mermaid.js | relative_url }}"></script>
 
 <script>
   $(function() {

diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html
@@ -2,7 +2,7 @@
   The paginator for post list on HomgPage.
 -->
 
-<ul class="pagination align-items-center mt-4 mb-0 pl-lg-2">
+<ul class="pagination align-items-center mt-4 mb-5 pl-lg-2">
   <!-- left arrow -->
   {% if paginator.previous_page %}
     {% assign prev_url = paginator.previous_page_path | relative_url %}

diff --git a/_includes/search-loader.html b/_includes/search-loader.html
@@ -16,7 +16,7 @@
 
 {% capture not_found %}<p class="mt-5">{{ site.data.locales[lang].search.no_results }}</p>{% endcapture %}
 
-<script src="{{ site.data.assets[origin].search.js }}"></script>
+<script src="{{ site.data.assets[origin].search.js | relative_url }}"></script>
 
 <script>
 SimpleJekyllSearch({

diff --git a/_includes/toc.html b/_includes/toc.html
@@ -7,7 +7,7 @@
 
 {% if enable_toc %}
 <!-- BS-toc.js will be loaded at medium priority -->
-<script src="{{ site.data.assets[origin].bootstrap-toc.js }}"></script>
+<script src="{{ site.data.assets[origin].bootstrap-toc.js | relative_url }}"></script>
 
 <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
   <div class="panel-heading pl-3 pt-2 mb-2">{{- site.data.locales[lang].panel.toc -}}</div>

diff --git a/_includes/topbar.html b/_includes/topbar.html
@@ -2,8 +2,8 @@
   The Top Bar
 -->
 
-<div id="topbar-wrapper" class="row justify-content-center">
-  <div id="topbar" class="col-11 d-flex h-100 align-items-center justify-content-between">
+<div id="topbar-wrapper">
+  <div id="topbar" class="container d-flex align-items-center justify-content-between h-100 pl-3 pr-3 pl-md-4 pr-md-4">
     <span id="breadcrumb">
 
     {% assign paths = page.url | split: '/' %}

diff --git a/_javascript/copyright b/_javascript/copyright
@@ -1,5 +1,5 @@
 /*!
- * Chirpy v5.1.0 (https://github.com/cotes2020/jekyll-theme-chirpy/)
+ * Chirpy v5.2.0 (https://github.com/cotes2020/jekyll-theme-chirpy/)
  * © 2019 Cotes Chung
  * MIT Licensed
  */
diff --git a/_layouts/categories.html b/_layouts/categories.html
@@ -47,10 +47,24 @@
         <span class="text-muted small font-weight-light">
           {% if sub_categories_size > 0 %}
             {{ sub_categories_size }}
-            {{ site.data.locales[lang].categories.category_measure }},
+            {% if sub_categories_size > 1 %}
+              {{ site.data.locales[lang].categories.category_measure.plural
+                | default: site.data.locales[lang].categories.category_measure }}
+            {% else %}
+              {{ site.data.locales[lang].categories.category_measure.singular
+                | default: site.data.locales[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 }}
+          {% else %}
+            {{ site.data.locales[lang].categories.post_measure.singular
+              | default: site.data.locales[lang].categories.post_measure }}
           {% endif %}
-            {{ top_posts_size }}
-            {{ site.data.locales[lang].categories.post_measure }}
         </span>
       </span>
 
@@ -83,7 +97,14 @@
           {% assign posts_size = site.categories[sub_category] | size %}
           <span class="text-muted small font-weight-light">
             {{ posts_size }}
-            {{ site.data.locales[lang].categories.post_measure }}
+
+            {% if posts_size > 1 %}
+              {{ site.data.locales[lang].categories.post_measure.plural
+                | default: site.data.locales[lang].categories.post_measure }}
+            {% else %}
+              {{ site.data.locales[lang].categories.post_measure.singular
+                | default: site.data.locales[lang].categories.post_measure }}
+            {% endif %}
           </span>
         </li>
         {% endfor %}