jekyll-theme-chirpy 4.1.0 → 4.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +86 -89
  3. data/_config.yml +7 -14
  4. data/_data/contact.yml +1 -1
  5. data/_data/locales/en.yml +8 -5
  6. data/_data/locales/id-ID.yml +90 -0
  7. data/_data/locales/zh-CN.yml +8 -5
  8. data/_includes/disqus.html +42 -13
  9. data/_includes/footer.html +3 -5
  10. data/_includes/head.html +5 -6
  11. data/_includes/js-selector.html +1 -1
  12. data/_includes/lang.html +8 -0
  13. data/_includes/language-alias.html +72 -0
  14. data/_includes/panel.html +5 -3
  15. data/_includes/post-nav.html +4 -4
  16. data/_includes/post-sharing.html +4 -3
  17. data/_includes/read-time.html +5 -4
  18. data/_includes/refactor-content.html +36 -13
  19. data/_includes/related-posts.html +1 -1
  20. data/_includes/search-loader.html +2 -2
  21. data/_includes/search-results.html +1 -1
  22. data/_includes/sidebar.html +3 -3
  23. data/_includes/timeago.html +3 -3
  24. data/_includes/topbar.html +14 -18
  25. data/_layouts/archives.html +3 -1
  26. data/_layouts/categories.html +5 -3
  27. data/_layouts/category.html +3 -1
  28. data/_layouts/default.html +3 -1
  29. data/_layouts/home.html +3 -1
  30. data/_layouts/page.html +1 -1
  31. data/_layouts/post.html +9 -9
  32. data/_layouts/tag.html +3 -1
  33. data/_sass/addon/commons.scss +109 -69
  34. data/_sass/addon/module.scss +10 -10
  35. data/_sass/addon/syntax.scss +98 -22
  36. data/_sass/addon/variables.scss +2 -2
  37. data/_sass/colors/dark-syntax.scss +18 -14
  38. data/_sass/colors/dark-typography.scss +22 -18
  39. data/_sass/colors/light-syntax.scss +5 -1
  40. data/_sass/colors/light-typography.scss +25 -20
  41. data/_sass/jekyll-theme-chirpy.scss +1 -1
  42. data/_sass/layout/categories.scss +14 -13
  43. data/_sass/layout/home.scss +1 -3
  44. data/_sass/layout/post.scss +19 -15
  45. data/_tabs/about.md +1 -1
  46. data/_tabs/tags.md +1 -1
  47. data/assets/404.html +6 -4
  48. data/assets/feed.xml +1 -1
  49. data/assets/js/data/search.json +1 -1
  50. data/assets/js/dist/categories.min.js +1 -1
  51. data/assets/js/dist/commons.min.js +1 -1
  52. data/assets/js/dist/home.min.js +2 -2
  53. data/assets/js/dist/page.min.js +2 -2
  54. data/assets/js/dist/post.min.js +2 -2
  55. data/assets/js/dist/pvreport.min.js +1 -1
  56. metadata +6 -7
  57. data/assets/js/lib/jquery.disqusloader.min.js +0 -8
@@ -0,0 +1,72 @@
1
+ {% comment %}
2
+
3
+ Convert the alias of the syntax language to the official name
4
+
5
+ See: <https://github.com/rouge-ruby/rouge/wiki/List-of-supported-languages-and-lexers>
6
+
7
+ {% endcomment %}
8
+
9
+ {% assign _lang = include.language | default: '' %}
10
+
11
+ {% case _lang %}
12
+ {% when 'actionscript', 'as', 'as3' %}
13
+ {{ 'ActionScript' }}
14
+ {% when 'applescript' %}
15
+ {{ 'AppleScript' }}
16
+ {% when 'brightscript', 'bs', 'brs' %}
17
+ {{ 'BrightScript' }}
18
+ {% when 'cfscript', 'cfc' %}
19
+ {{ 'CFScript' }}
20
+ {% when 'coffeescript', 'coffee', 'coffee-script' %}
21
+ {{ 'CoffeeScript' }}
22
+ {% when 'cs', 'csharp' %}
23
+ {{ 'C#' }}
24
+ {% when 'erl' %}
25
+ {{ 'Erlang' }}
26
+ {% when 'graphql' %}
27
+ {{ 'GraphQL' }}
28
+ {% when 'haskell', 'hs' %}
29
+ {{ 'Haskell' }}
30
+ {% when 'javascript', 'js' %}
31
+ {{ 'JavaScript' }}
32
+ {% when 'make', 'mf', 'gnumake', 'bsdmake' %}
33
+ {{ 'Makefile' }}
34
+ {% when 'md', 'mkd' %}
35
+ {{ 'Markdown' }}
36
+ {% when 'm' %}
37
+ {{ 'Matlab' }}
38
+ {% when 'objective_c', 'objc', 'obj-c', 'obj_c', 'objectivec' %}
39
+ {{ 'Objective-C' }}
40
+ {% when 'perl', 'pl' %}
41
+ {{ 'Perl' }}
42
+ {% when 'php','php3','php4','php5' %}
43
+ {{ 'PHP' }}
44
+ {% when 'plaintext', 'text' %}
45
+ {{ 'Text' }}
46
+ {% when 'py' %}
47
+ {{ 'Python' }}
48
+ {% when 'rb' %}
49
+ {{ 'Ruby' }}
50
+ {% when 'rs','no_run','ignore','should_panic' %}
51
+ {{ 'Rust' }}
52
+ {% when 'bash', 'zsh', 'ksh', 'sh' %}
53
+ {{ 'Shell' }}
54
+ {% when 'st', 'squeak' %}
55
+ {{ 'Smalltalk' }}
56
+ {% when 'tex'%}
57
+ {{ 'TeX' }}
58
+ {% when 'latex' %}
59
+ {{ 'LaTex' }}
60
+ {% when 'ts', 'typescript' %}
61
+ {{ 'TypeScript' }}
62
+ {% when 'vb', 'visualbasic' %}
63
+ {{ 'Visual Basic' }}
64
+ {% when 'vue', 'vuejs' %}
65
+ {{ 'Vue.js' }}
66
+ {% when 'yml' %}
67
+ {{ 'YAML' }}
68
+ {% when 'css', 'html', 'scss', 'ssh', 'toml', 'xml', 'yaml' %}
69
+ {{ _lang | upcase }}
70
+ {% else %}
71
+ {{ _lang | capitalize }}
72
+ {% endcase %}
data/_includes/panel.html CHANGED
@@ -2,6 +2,8 @@
2
2
  The Pannel on right side (Desktop views)
3
3
  -->
4
4
 
5
+ {% include lang.html %}
6
+
5
7
  <div id="panel-wrapper" class="col-xl-3 pl-2 text-muted topbar-down">
6
8
 
7
9
  <div class="access">
@@ -11,7 +13,7 @@
11
13
  {% if update_list.size > 0 %}
12
14
 
13
15
  <div id="access-lastmod" class="post">
14
- <span>{{- site.data.locales[site.lang].panel.lastmod | default: 'Recent Update' -}}</span>
16
+ <span>{{- site.data.locales[lang].panel.lastmod -}}</span>
15
17
  <ul class="post-content pl-0 pb-1 ml-1 mt-2">
16
18
 
17
19
  {% for item in update_list %}
@@ -30,7 +32,7 @@
30
32
 
31
33
  {% if trending_tags.size > 0 %}
32
34
  <div id="access-tags">
33
- <span>{{- site.data.locales[site.lang].panel.trending_tags | default: 'Trending Tags' -}}</span>
35
+ <span>{{- site.data.locales[lang].panel.trending_tags -}}</span>
34
36
  <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
35
37
 
36
38
  {% for tag_name in trending_tags %}
@@ -48,7 +50,7 @@
48
50
  <script src="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc@1.0.1/dist/bootstrap-toc.min.js"></script>
49
51
  <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
50
52
  <span class="pl-3 pt-2 mb-2">
51
- {{- site.data.locales[site.lang].panel.toc | default: 'Contents' -}}
53
+ {{- site.data.locales[lang].panel.toc -}}
52
54
  </span>
53
55
  <nav id="toc" data-toggle="toc"></nav>
54
56
  </div>
@@ -5,24 +5,24 @@
5
5
  <div class="post-navigation d-flex justify-content-between">
6
6
  {% if page.previous.url %}
7
7
  <a href="{{ site.baseurl }}{{ page.previous.url }}" class="btn btn-outline-primary"
8
- prompt="{{ site.data.locales[site.lang].post.button.previous | default: 'previous' }}">
8
+ prompt="{{ site.data.locales[lang].post.button.previous }}">
9
9
  <p>{{ page.previous.title }}</p>
10
10
  </a>
11
11
  {% else %}
12
12
  <span class="btn btn-outline-primary disabled"
13
- prompt="{{ site.data.locales[site.lang].post.button.previous | default: 'previous' }}">
13
+ prompt="{{ site.data.locales[lang].post.button.previous }}">
14
14
  <p>-</p>
15
15
  </span>
16
16
  {% endif %}
17
17
 
18
18
  {% if page.next.url %}
19
19
  <a href="{{ site.baseurl }}{{page.next.url}}" class="btn btn-outline-primary"
20
- prompt="{{ site.data.locales[site.lang].post.button.next | default: 'next' }}">
20
+ prompt="{{ site.data.locales[lang].post.button.next }}">
21
21
  <p>{{ page.next.title }}</p>
22
22
  </a>
23
23
  {% else %}
24
24
  <span class="btn btn-outline-primary disabled"
25
- prompt="{{ site.data.locales[site.lang].post.button.next | default: 'next' }}">
25
+ prompt="{{ site.data.locales[lang].post.button.next }}">
26
26
  <p>-</p>
27
27
  </span>
28
28
  {% endif %}
@@ -3,7 +3,7 @@
3
3
  -->
4
4
 
5
5
  <div class="share-wrapper">
6
- <span class="share-label text-muted mr-1">{{ site.data.locales[site.lang].post.share | default: 'Share' }}</span>
6
+ <span class="share-label text-muted mr-1">{{ site.data.locales[lang].post.share }}</span>
7
7
  <span class="share-icons">
8
8
  {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
9
9
  {% assign url = page.url | absolute_url %}
@@ -16,9 +16,10 @@
16
16
  </a>
17
17
  {% endfor %}
18
18
 
19
- <i class="fa-fw fas fa-link small" onclick="copyLink('', '{{ site.data.locales[site.lang].post.button.copy.succeed }}')"
19
+ <i id="copy-link" class="fa-fw fas fa-link small"
20
20
  data-toggle="tooltip" data-placement="top"
21
- title="{{ site.data.locales[site.lang].post.button.copy.title }}">
21
+ title="{{ site.data.locales[lang].post.button.share_link.title }}"
22
+ title-succeed="{{ site.data.locales[lang].post.button.share_link.succeed }}">
22
23
  </i>
23
24
 
24
25
  </span>
@@ -16,14 +16,15 @@
16
16
  {% endunless %}
17
17
 
18
18
  {% capture read_prompt %}
19
- {{- site.data.locales[site.lang].post.read_time.prompt | default: "read" -}}
19
+ {{- site.data.locales[lang].post.read_time.prompt -}}
20
20
  {% endcapture %}
21
21
 
22
22
  <!-- return element -->
23
23
  <span class="readtime" data-toggle="tooltip" data-placement="bottom"
24
- title="{{ words }} {{ site.data.locales[site.lang].post.words | default: "words" }}">
25
- {{- read_time -}}{{" "}}{{- site.data.locales[site.lang].post.read_time.unit | default: "min" -}}
24
+ title="{{ words }} {{ site.data.locales[lang].post.words }}">
25
+ {{- read_time -}}{{" "}}{{- site.data.locales[lang].post.read_time.unit -}}
26
26
  {%- if include.prompt -%}
27
- {% unless site.lang contains 'zh' %}{{" "}}{% endunless %}{{ read_prompt }}
27
+ {% assign _prompt_words = read_prompt | number_of_words: 'auto' %}
28
+ {% unless _prompt_words > 1 %}{{" "}}{% endunless %}{{ read_prompt }}
28
29
  {%- endif -%}
29
30
  </span>
@@ -102,25 +102,48 @@
102
102
 
103
103
  {% endif %}
104
104
 
105
- <!-- Add lang-badge for code snippets -->
105
+ <!-- Add header for code snippets -->
106
106
 
107
- {% if _content contains '<div class="language-' %}
108
- {% assign _code_splits = _content | split: '<div class="language-' %}
109
- {% assign _new_content = nil %}
107
+ {% if _content contains '<div class="highlight"><code>' %}
108
+ {% assign _code_spippets = _content | split: '<div class="highlight"><code>' %}
109
+ {% assign _new_content = '' %}
110
+
111
+ {% for _snippet in _code_spippets %}
112
+
113
+ {% if forloop.last %}
114
+ {% assign _new_content = _new_content | append: _snippet %}
110
115
 
111
- {% for _snippet in _code_splits %}
112
- {% if forloop.first %}
113
- {% assign _new_content = _snippet %}
114
116
  {% else %}
115
- {% assign _lang = _snippet | split: ' ' | first %}
116
- {% capture _tag_head %}<div lang="{{_lang}}" class="language-{% endcapture %}
117
- {% assign _new_content = _new_content | append: _tag_head | append: _snippet %}
117
+
118
+ {% assign _left = _snippet | split: '><' | last%}
119
+
120
+ {% if _left contains 'file="' %}
121
+ {% assign _text = _left | split: 'file="' | last | split: '"' | first %}
122
+ {% assign _label_icon = 'far fa-file-code' %}
123
+ {% else %}
124
+ {% assign _lang = _left | split: 'language-' | last | split: ' ' | first %}
125
+ {% capture _text %}{% include language-alias.html language=_lang %}{% endcapture %}
126
+ {% assign _label_icon = 'fas fa-code small' %}
127
+ {% endif %}
128
+
129
+ {% capture _label %}
130
+ <span text-data="{{ _text }}"><i class="fa-fw {{ _label_icon }}"></i></span>
131
+ {% endcapture %}
132
+
133
+ {% assign _new_content = _new_content | append: _snippet
134
+ | append: '<div class="code-header">'
135
+ | append: _label
136
+ | append: '<button aria-label="copy" title-succeed="'
137
+ | append: site.data.locales[lang].post.button.copy_code.succeed
138
+ | append: '"><i class="far fa-clipboard"></i></button></div>'
139
+ | append: '<div class="highlight"><code>'
140
+ %}
141
+
118
142
  {% endif %}
143
+
119
144
  {% endfor %}
120
145
 
121
- {% if _new_content %}
122
- {% assign _content = _new_content %}
123
- {% endif %}
146
+ {% assign _content = _new_content %}
124
147
 
125
148
  {% endif %}
126
149
 
@@ -81,7 +81,7 @@
81
81
  {% if index_list.size > 0 %}
82
82
  <div id="related-posts" class="mt-5 mb-2 mb-sm-4">
83
83
  <h3 class="pt-2 mt-1 mb-4 ml-1"
84
- data-toc-skip>{{ site.data.locales[site.lang].post.relate_posts | default: 'Further Reading' }}</h3>
84
+ data-toc-skip>{{ site.data.locales[lang].post.relate_posts }}</h3>
85
85
  <div class="card-deck mb-4">
86
86
  {% for entry in index_list %}
87
87
  {% assign index = entry | plus: 0 %}
@@ -14,9 +14,9 @@
14
14
  </div>
15
15
  {% endcapture %}
16
16
 
17
- {% capture not_found %}<p class="mt-5">Oops! No result founds.</p>{% endcapture %}
17
+ {% capture not_found %}<p class="mt-5">{{ site.data.locales[lang].search.no_results }}</p>{% endcapture %}
18
18
 
19
- <script src="https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.7.3/dest/simple-jekyll-search.min.js"></script>
19
+ <script src="https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js"></script>
20
20
 
21
21
  <script>
22
22
  SimpleJekyllSearch({
@@ -4,7 +4,7 @@
4
4
  <div id="search-result-wrapper" class="d-flex justify-content-center unloaded">
5
5
  <div class="col-12 col-sm-11 post-content">
6
6
  <div id="search-hints">
7
- <h4 class="text-muted mb-4">{{ site.data.locales[site.lang].panel.trending_tags | default: 'Trending Tags' }}</h4>
7
+ <h4 class="text-muted mb-4">{{ site.data.locales[lang].panel.trending_tags }}</h4>
8
8
 
9
9
  {% include trending-tags.html %}
10
10
 
@@ -32,7 +32,7 @@
32
32
  <li class="nav-item{% if page.layout == 'home' %}{{ " active" }}{% endif %}">
33
33
  <a href="{{ '/' | relative_url }}" class="nav-link">
34
34
  <i class="fa-fw fas fa-home ml-xl-3 mr-xl-3 unloaded"></i>
35
- <span>{{ site.data.locales[site.lang].tabs.home | default: "home" | upcase }}</span>
35
+ <span>{{ site.data.locales[lang].tabs.home | upcase }}</span>
36
36
  </a>
37
37
  </li>
38
38
  <!-- the real tabs -->
@@ -42,14 +42,14 @@
42
42
  <i class="fa-fw {{ tab.icon }} ml-xl-3 mr-xl-3 unloaded"></i>
43
43
  {% capture tab_name %}{{ tab.url | split: '/' }}{% endcapture %}
44
44
 
45
- <span>{{ site.data.locales[site.lang].tabs.[tab_name] | default: tab_name | upcase }}</span>
45
+ <span>{{ site.data.locales[lang].tabs.[tab_name] | default: tab.title | upcase }}</span>
46
46
  </a>
47
47
  </li> <!-- .nav-item -->
48
48
  {% endfor %}
49
49
 
50
50
  </ul> <!-- ul.nav.flex-column -->
51
51
 
52
- <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center">
52
+ <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center align-items-center">
53
53
 
54
54
  {% for entry in site.data.contact %}
55
55
  {% capture url %}
@@ -3,9 +3,9 @@
3
3
  See: /assets/js/_utils/timeage.js
4
4
  -->
5
5
 
6
- {% assign tooltip_df = site.data.locales[site.lang].date_format.tooltip | default: '%a, %b %e, %Y, %l:%M %p %z' %}
7
- {% assign post_long_df = site.data.locales[site.lang].date_format.post.long | default: '%b %e, %Y' %}
8
- {% assign post_short_df = site.data.locales[site.lang].date_format.post.short | default: '%b %e' %}
6
+ {% assign tooltip_df = site.data.locales[lang].date_format.tooltip %}
7
+ {% assign post_long_df = site.data.locales[lang].date_format.post.long %}
8
+ {% assign post_short_df = site.data.locales[lang].date_format.post.short %}
9
9
 
10
10
  {% if include.preposition %}
11
11
  {{ include.preposition }}
@@ -10,7 +10,7 @@
10
10
 
11
11
  {% if paths.size == 0 or page.layout == 'home' %}
12
12
  <!-- index page -->
13
- <span>{{ site.data.locales[site.lang].tabs.home | default: 'home' | capitalize }}</span>
13
+ <span>{{ site.data.locales[lang].tabs.home | capitalize }}</span>
14
14
 
15
15
  {% else %}
16
16
 
@@ -19,28 +19,24 @@
19
19
  {% if forloop.first %}
20
20
  <span>
21
21
  <a href="{{ '/' | relative_url }}">
22
- {{ site.data.locales[site.lang].tabs.home | default: 'home' | capitalize }}
22
+ {{ site.data.locales[lang].tabs.home | capitalize }}
23
23
  </a>
24
24
  </span>
25
25
 
26
26
  {% elsif forloop.last %}
27
27
 
28
28
  {% if page.collection == 'tabs' %}
29
- <span>{{ site.data.locales[site.lang].tabs[item] | default: page.title }}</span>
29
+ <span>{{ site.data.locales[lang].tabs[item] | default: page.title }}</span>
30
30
  {% else %}
31
31
  <span>{{ page.title }}</span>
32
32
  {% endif %}
33
33
 
34
- {% else %}
35
-
36
- {% unless page.layout == 'post' %}
37
- <span>
38
- <a href="{{ item | relative_url }}">
39
- {{ site.data.locales[site.lang].tabs[item] | default: page.title }}
40
- </a>
41
- </span>
42
- {% endunless %}
43
-
34
+ {% elsif page.layout == 'category' or page.layout == 'tag' %}
35
+ <span>
36
+ <a href="{{ item | relative_url }}">
37
+ {{ site.data.locales[lang].tabs[item] | default: page.title }}
38
+ </a>
39
+ </span>
44
40
  {% endif %}
45
41
 
46
42
  {% endfor %}
@@ -53,12 +49,12 @@
53
49
 
54
50
  <div id="topbar-title">
55
51
  {% if page.layout == 'home' %}
56
- {{- site.data.locales[site.lang].title | default: site.title -}}
52
+ {{- site.data.locales[lang].title | default: site.title -}}
57
53
  {% elsif page.collection == 'tabs' %}
58
54
  {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
59
- {{- site.data.locales[site.lang].tabs[tab_key] | default: page.title -}}
55
+ {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
60
56
  {% else %}
61
- {{- site.data.locales[site.lang].layout[page.layout] | default: page.layout | capitalize -}}
57
+ {{- site.data.locales[lang].layout[page.layout] | default: page.layout | capitalize -}}
62
58
  {% endif %}
63
59
  </div>
64
60
 
@@ -66,10 +62,10 @@
66
62
  <span id="search-wrapper" class="align-items-center">
67
63
  <i class="fas fa-search fa-fw"></i>
68
64
  <input class="form-control" id="search-input" type="search"
69
- aria-label="search" autocomplete="off" placeholder="{{ site.data.locales[site.lang].search.hint | default: 'Search' | capitalize }}...">
65
+ aria-label="search" autocomplete="off" placeholder="{{ site.data.locales[lang].search.hint | capitalize }}...">
70
66
  <i class="fa fa-times-circle fa-fw" id="search-cleaner"></i>
71
67
  </span>
72
- <span id="search-cancel" >{{ site.data.locales[site.lang].search.cancel | default: 'Cancel' }}</span>
68
+ <span id="search-cancel" >{{ site.data.locales[lang].search.cancel }}</span>
73
69
  </div>
74
70
 
75
71
  </div>
@@ -3,6 +3,8 @@ layout: page
3
3
  # The Archives of posts.
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  <div id="archives" class="pl-xl-2">
7
9
 
8
10
  {% for post in site.posts %}
@@ -17,7 +19,7 @@ layout: page
17
19
  <li>
18
20
  <div>
19
21
  {% capture this_day %}{{ post.date | date: "%d" }}{% endcapture %}
20
- {% capture _mth_df %}{{ site.data.locales[site.lang].date_format.post.archive_month | default: "%b" }}{% endcapture %}
22
+ {% capture _mth_df %}{{ site.data.locales[lang].date_format.post.archive_month }}{% endcapture %}
21
23
  {% capture this_month %}{{ post.date | date: _mth_df }}{% endcapture %}
22
24
  <span class="date day">{{ this_day }}</span>
23
25
  <span class="date month small text-muted">{% include no-zero-date.html date_str=this_month %}</span>
@@ -3,6 +3,8 @@ layout: page
3
3
  # All the Categories of posts
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  {% assign HEAD_PREFIX = "h_" %}
7
9
  {% assign LIST_PREFIX = "l_" %}
8
10
 
@@ -45,10 +47,10 @@ layout: page
45
47
  <span class="text-muted small font-weight-light">
46
48
  {% if sub_categories_size > 0 %}
47
49
  {{ sub_categories_size }}
48
- {{ site.data.locales[site.lang].categories.category_measure | default: 'categories' }},
50
+ {{ site.data.locales[lang].categories.category_measure }},
49
51
  {% endif %}
50
52
  {{ top_posts_size }}
51
- {{ site.data.locales[site.lang].categories.post_measure | default: 'posts' }}
53
+ {{ site.data.locales[lang].categories.post_measure }}
52
54
  </span>
53
55
  </span>
54
56
 
@@ -81,7 +83,7 @@ layout: page
81
83
  {% assign posts_size = site.categories[sub_category] | size %}
82
84
  <span class="text-muted small font-weight-light">
83
85
  {{ posts_size }}
84
- {{ site.data.locales[site.lang].categories.post_measure | default: 'posts' }}
86
+ {{ site.data.locales[lang].categories.post_measure }}
85
87
  </span>
86
88
  </li>
87
89
  {% endfor %}
@@ -3,6 +3,8 @@ layout: page
3
3
  # The Category layout
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  <div id="page-category">
7
9
  <h1 class="pl-lg-2">
8
10
  <i class="far fa-folder-open fa-fw text-muted"></i>
@@ -11,7 +13,7 @@ layout: page
11
13
  </h1>
12
14
 
13
15
  <ul class="post-content pl-0">
14
- {% assign post_df = site.data.locales[site.lang].date_format.post.long | default: '%b %e, %Y' %}
16
+ {% assign post_df = site.data.locales[lang].date_format.post.long %}
15
17
 
16
18
  {% for post in page.posts %}
17
19
  <li class="d-flex justify-content-between pl-md-3 pr-md-3">
@@ -5,13 +5,15 @@ layout: compress
5
5
 
6
6
  <!DOCTYPE html>
7
7
 
8
+ {% include lang.html %}
9
+
8
10
  {% capture prefer_mode %}
9
11
  {% if site.theme_mode %}
10
12
  mode="{{ site.theme_mode }}"
11
13
  {% endif %}
12
14
  {% endcapture %}
13
15
 
14
- <html lang="{{ site.content_lang | default: site.lang }}" {{ prefer_mode }}>
16
+ <html lang="{{ site.lang }}" {{ prefer_mode }}>
15
17
 
16
18
  {% include head.html %}
17
19
 
data/_layouts/home.html CHANGED
@@ -3,6 +3,8 @@ layout: page
3
3
  # The Home page layout
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  {% assign pinned = site.posts | where: "pin", "true" %}
7
9
  {% assign default = site.posts | where_exp: "item", "item.pin != true" %}
8
10
 
@@ -78,7 +80,7 @@ layout: page
78
80
  {% if post.pin %}
79
81
  <div class="pin">
80
82
  <i class="fas fa-thumbtack fa-fw"></i>
81
- <span>{{ site.data.locales[site.lang].post.pin_prompt | default: 'Pinned' }}</span>
83
+ <span>{{ site.data.locales[lang].post.pin_prompt }}</span>
82
84
  </div>
83
85
  {% endif %}
84
86
 
data/_layouts/page.html CHANGED
@@ -10,7 +10,7 @@ layout: default
10
10
  <h1 class="dynamic-title">
11
11
  {% if page.collection == 'tabs' %}
12
12
  {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
13
- {{- site.data.locales[site.lang].tabs[tab_key] | default: page.title -}}
13
+ {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
14
14
  {% else %}
15
15
  {{- page.title -}}
16
16
  {% endif %}
data/_layouts/post.html CHANGED
@@ -3,6 +3,8 @@ layout: default
3
3
  # The posts' layout
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  <div class="row">
7
9
 
8
10
  <div id="post-wrapper" class="col-12 col-lg-11 col-xl-8">
@@ -17,7 +19,7 @@ layout: default
17
19
  <span class="semi-bold">
18
20
  {{ page.author | default: site.social.name }}
19
21
  </span>
20
- {% capture _preposition %}{{ site.data.locales[site.lang].post.published | default: 'on' }}{% endcapture %}
22
+ {% capture _preposition %}{{ site.data.locales[lang].post.published }}{% endcapture %}
21
23
  {% include timeago.html date=page.date tooltip=true preposition=_preposition %}
22
24
  </div>
23
25
 
@@ -25,7 +27,7 @@ layout: default
25
27
  <!-- lastmod -->
26
28
  {% if page.last_modified_at %}
27
29
  <span>
28
- {{ site.data.locales[site.lang].post.updated | default: 'Updated' }}
30
+ {{ site.data.locales[lang].post.updated }}
29
31
  {% include timeago.html date=page.last_modified_at class="lastmod" tooltip=true %}
30
32
  </span>
31
33
  {% endif %}
@@ -38,7 +40,7 @@ layout: default
38
40
  <span id="pv" class="pageviews">
39
41
  <i class="fas fa-spinner fa-spin fa-fw"></i>
40
42
  </span>
41
- {{ site.data.locales[site.lang].post.pageview_measure | default: "views" }}
43
+ {{ site.data.locales[lang].post.pageview_measure }}
42
44
  {% endif %}
43
45
 
44
46
  </div>
@@ -89,15 +91,13 @@ layout: default
89
91
  <div class="post-tail-bottom
90
92
  d-flex justify-content-between align-items-center mt-3 pt-5 pb-2">
91
93
  <div class="license-wrapper">
92
- {% if site.data.locales[site.lang].copyright.license.template %}
94
+ {% if site.data.locales[lang].copyright.license.template %}
93
95
  {% capture _replacement %}
94
- <a href="{{ site.data.locales[site.lang].copyright.license.link }}">
95
- {{ site.data.locales[site.lang].copyright.license.name }}
96
+ <a href="{{ site.data.locales[lang].copyright.license.link }}">
97
+ {{ site.data.locales[lang].copyright.license.name }}
96
98
  </a>
97
99
  {% endcapture %}
98
- {{ site.data.locales[site.lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
99
- {% else %}
100
- <span class="text-muted small">{{ site.outdated }}</span>
100
+ {{ site.data.locales[lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
101
101
  {% endif %}
102
102
  </div>
103
103
 
data/_layouts/tag.html CHANGED
@@ -3,6 +3,8 @@ layout: page
3
3
  # The layout for Tag page
4
4
  ---
5
5
 
6
+ {% include lang.html %}
7
+
6
8
  <div id="page-tag">
7
9
  <h1 class="pl-lg-2">
8
10
  <i class="fa fa-tag fa-fw text-muted"></i>
@@ -10,7 +12,7 @@ layout: page
10
12
  <span class="lead text-muted pl-2">{{ page.posts | size }}</span>
11
13
  </h1>
12
14
  <ul class="post-content pl-0">
13
- {% assign post_df = site.data.locales[site.lang].date_format.post.long | default: '%b %e, %Y' %}
15
+ {% assign post_df = site.data.locales[lang].date_format.post.long %}
14
16
 
15
17
  {% for post in page.posts %}
16
18
  <li class="d-flex justify-content-between pl-md-3 pr-md-3">