From 2840c9ccd2acd3a8300008581b9c41c350b216e7 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 17 Apr 2023 04:17:42 +0800
Subject: [PATCH] perf(i18n): set the global default locales to "en" (#979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- avoid missing labels caused by languages ​​outside of locales
- also improved the code style
---
 _includes/datetime.html      |  28 +++--
 _includes/footer.html        |  46 ++++---
 _includes/post-nav.html      |  54 ++++----
 _includes/post-sharing.html  |  67 +++++-----
 _includes/read-time.html     |  29 ++---
 _includes/related-posts.html | 131 +++++++-------------
 _includes/search-loader.html |  23 ++--
 _includes/sidebar.html       |   4 +
 _includes/toc.html           |  21 ++--
 _includes/topbar.html        |  75 ++++++-----
 _includes/trending-tags.html |  68 ++++------
 _includes/update-list.html   |  59 ++++-----
 _layouts/categories.html     | 232 ++++++++++++++++-------------------
 _layouts/category.html       |  11 +-
 _layouts/default.html        |  59 +++++++++
 _layouts/page.html           |  18 +--
 _layouts/post.html           | 133 +++++++++-----------
 _layouts/tag.html            |  11 +-
 assets/404.html              |   6 +
 19 files changed, 513 insertions(+), 562 deletions(-)

diff --git a/_includes/datetime.html b/_includes/datetime.html
index 9f954b698ef..87c03338b05 100644
--- a/_includes/datetime.html
+++ b/_includes/datetime.html
@@ -3,18 +3,30 @@
   See: ${JS_ROOT}/utils/locale-dateime.js
 -->
 
-{% assign df_strftime = site.data.locales[include.lang].df.post.strftime | default: '%d/%m/%Y' %}
-{% assign df_dayjs = site.data.locales[include.lang].df.post.dayjs | default: 'DD/MM/YYYY' %}
+{% assign df_strftime = site.data.locales[include.lang].df.post.strftime |
+default: '%d/%m/%Y' %} {% assign df_dayjs =
+site.data.locales[include.lang].df.post.dayjs | default: 'DD/MM/YYYY' %}
 
 <time
-  {% if include.class %}
-    class="{{ include.class }}"
-  {% endif %}
+  {%
+  if
+  include.class
+  %}
+  class="{{ include.class }}"
+  {%
+  endif
+  %}
   data-ts="{{ include.date | date: '%s' }}"
   data-df="{{ df_dayjs }}"
-  {% if include.tooltip %}
-    data-bs-toggle="tooltip" data-bs-placement="bottom"
-  {% endif %}
+  {%
+  if
+  include.tooltip
+  %}
+  data-bs-toggle="tooltip"
+  data-bs-placement="bottom"
+  {%
+  endif
+  %}
 >
   {{ include.date | date: df_strftime }}
 </time>
diff --git a/_includes/footer.html b/_includes/footer.html
index a015f469f1b..2340fbf1a90 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,41 +2,37 @@
 
 <footer
   aria-label="Site Info"
-  class="
-    d-flex flex-column justify-content-center text-muted
-    flex-lg-row justify-content-lg-between align-items-lg-center pb-lg-3
-  "
+  class="d-flex flex-column justify-content-center text-muted flex-lg-row justify-content-lg-between align-items-lg-center pb-lg-3"
 >
   <p>
     {{- '©' }}
     <time>{{ 'now' | date: '%Y' }}</time>
 
     {% if site.social.links %}
-      <a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>.
-    {% else %}
-      <em class="fst-normal">{{ site.social.name }}</em>.
-    {% endif %}
-
-    {% if site.data.locales[include.lang].copyright.brief %}
-      <span
-        data-bs-toggle="tooltip"
-        data-bs-placement="top"
-        title="{{ site.data.locales[include.lang].copyright.verbose }}"
-      >
-        {{- site.data.locales[include.lang].copyright.brief -}}
-      </span>
+    <a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>. {% else %}
+    <em class="fst-normal">{{ site.social.name }}</em>. {% endif %} {% if
+    site.data.locales[include.lang].copyright.brief %}
+    <span
+      data-bs-toggle="tooltip"
+      data-bs-placement="top"
+      title="{{ site.data.locales[include.lang].copyright.verbose }}"
+    >
+      {{- site.data.locales[include.lang].copyright.brief -}}
+    </span>
     {% endif %}
   </p>
 
   <p>
     {%- capture _platform -%}
-      <a href="https://jekyllrb.com" target="_blank" rel="noopener">Jekyll</a>
-    {%- endcapture -%}
-
-    {%- capture _theme -%}
-      <a href="/cotes2020/jekyll-theme-chirpy" target="_blank" rel="noopener">Chirpy</a>
-    {%- endcapture -%}
-
-    {{ site.data.locales[include.lang].meta | replace: ':PLATFORM', _platform | replace: ':THEME', _theme }}
+    <a href="https://jekyllrb.com" target="_blank" rel="noopener">Jekyll</a>
+    {%- endcapture -%} {%- capture _theme -%}
+    <a
+      href="/cotes2020/jekyll-theme-chirpy"
+      target="_blank"
+      rel="noopener"
+      >Chirpy</a
+    >
+    {%- endcapture -%} {{ site.data.locales[include.lang].meta | replace:
+    ':PLATFORM', _platform | replace: ':THEME', _theme }}
   </p>
 </footer>
diff --git a/_includes/post-nav.html b/_includes/post-nav.html
index 736bec376b2..8b30c01a08f 100644
--- a/_includes/post-nav.html
+++ b/_includes/post-nav.html
@@ -1,34 +1,34 @@
 <!-- Navigation buttons at the bottom of the post. -->
 
-<nav class="post-navigation d-flex justify-content-between" aria-label="Post Navigation">
+<nav
+  class="post-navigation d-flex justify-content-between"
+  aria-label="Post Navigation"
+>
   {% assign previous = site.data.locales[include.lang].post.button.previous %}
-  {% assign next = site.data.locales[include.lang].post.button.next %}
-
-  {% if page.previous.url %}
-    <a
-      href="{{ site.baseurl }}{{ page.previous.url }}"
-      class="btn btn-outline-primary"
-      aria-label="{{ previous }}"
-    >
-      <p>{{ page.previous.title }}</p>
-    </a>
+  {% assign next = site.data.locales[include.lang].post.button.next %} {% if
+  page.previous.url %}
+  <a
+    href="{{ site.baseurl }}{{ page.previous.url }}"
+    class="btn btn-outline-primary"
+    aria-label="{{ previous }}"
+  >
+    <p>{{ page.previous.title }}</p>
+  </a>
   {% else %}
-    <div class="btn btn-outline-primary disabled" aria-label="{{ previous }}">
-      <p>-</p>
-    </div>
-  {% endif %}
-
-  {% if page.next.url %}
-    <a
-      href="{{ site.baseurl }}{{page.next.url}}"
-      class="btn btn-outline-primary"
-      aria-label="{{ next }}"
-    >
-      <p>{{ page.next.title }}</p>
-    </a>
+  <div class="btn btn-outline-primary disabled" aria-label="{{ previous }}">
+    <p>-</p>
+  </div>
+  {% endif %} {% if page.next.url %}
+  <a
+    href="{{ site.baseurl }}{{page.next.url}}"
+    class="btn btn-outline-primary"
+    aria-label="{{ next }}"
+  >
+    <p>{{ page.next.title }}</p>
+  </a>
   {% else %}
-    <div class="btn btn-outline-primary disabled" aria-label="{{ next }}">
-      <p>-</p>
-    </div>
+  <div class="btn btn-outline-primary disabled" aria-label="{{ next }}">
+    <p>-</p>
+  </div>
   {% endif %}
 </nav>
diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html
index d8941994925..7f0ae260385 100644
--- a/_includes/post-sharing.html
+++ b/_includes/post-sharing.html
@@ -1,40 +1,45 @@
 <!-- Post sharing snippet -->
 
 <div class="share-wrapper d-flex align-items-center">
-  <span class="share-label text-muted">{{ site.data.locales[include.lang].post.share }}</span>
+  <span class="share-label text-muted"
+    >{{ site.data.locales[include.lang].post.share }}</span
+  >
   <span class="share-icons">
-    {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
-    {% assign title = title | uri_escape %}
-    {% assign url = page.url | absolute_url | url_encode %}
-
-    {% for share in site.data.share.platforms -%}
-      {%- capture tooltip -%}
-        data-bs-toggle="tooltip" data-bs-placement="top" title="{{ share.type }}" aria-label="{{ share.type }}"
-      {%- endcapture -%}
-
-      {% if share.type == 'Mastodon' %}
-        <script defer type="module" src="https://cdn.jsdelivr.net/npm/@justinribeiro/share-to-mastodon/+esm"></script>
-        <button class="btn text-start" {{ tooltip }}>
-          <share-to-mastodon
-            class="share-mastodon"
-            message="{{ title }}"
-            url="{{ url }}"
-            {%- if share.instances -%}
-              customInstanceList="{{ share.instances | jsonify | xml_escape }}"
-            {%- endif %}
-          >
-            <i class="fa-fw {{ share.icon }}"></i>
-          </share-to-mastodon>
-        </button>
-
-        {% continue %}
-      {% endif %}
+    {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %} {%
+    assign title = title | uri_escape %} {% assign url = page.url | absolute_url
+    | url_encode %} {% for share in site.data.share.platforms -%} {%- capture
+    tooltip -%} data-bs-toggle="tooltip" data-bs-placement="top" title="{{
+    share.type }}" aria-label="{{ share.type }}" {%- endcapture -%} {% if
+    share.type == 'Mastodon' %}
+    <script
+      defer
+      type="module"
+      src="https://cdn.jsdelivr.net/npm/@justinribeiro/share-to-mastodon/+esm"
+    ></script>
+    <button class="btn text-start" {{ tooltip }}>
+      <share-to-mastodon
+        class="share-mastodon"
+        message="{{ title }}"
+        url="{{ url }}"
+        {%-
+        if
+        share.instances
+        -%}
+        customInstanceList="{{ share.instances | jsonify | xml_escape }}"
+        {%-
+        endif
+        %}
+      >
+        <i class="fa-fw {{ share.icon }}"></i>
+      </share-to-mastodon>
+    </button>
 
-      {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url %}
+    {% continue %} {% endif %} {% assign link = share.link | replace: 'TITLE',
+    title | replace: 'URL', url %}
 
-      <a href="{{ link }}" target="_blank" rel="noopener" {{ tooltip }}>
-        <i class="fa-fw {{ share.icon }}"></i>
-      </a>
+    <a href="{{ link }}" target="_blank" rel="noopener" {{ tooltip }}>
+      <i class="fa-fw {{ share.icon }}"></i>
+    </a>
     {% endfor %}
 
     <button
diff --git a/_includes/read-time.html b/_includes/read-time.html
index 99524102014..c1678000487 100644
--- a/_includes/read-time.html
+++ b/_includes/read-time.html
@@ -4,18 +4,10 @@
 
 <!-- words per minute -->
 
-{% assign wpm = 180 %}
-{% assign min_time = 1 %}
-
-{% assign read_time = words | divided_by: wpm %}
-
-{% unless read_time > 0 %}
-  {% assign read_time = min_time %}
-{% endunless %}
-
-{% capture read_prompt %}
-  {{- site.data.locales[include.lang].post.read_time.prompt -}}
-{% endcapture %}
+{% assign wpm = 180 %} {% assign min_time = 1 %} {% assign read_time = words |
+divided_by: wpm %} {% unless read_time > 0 %} {% assign read_time = min_time %}
+{% endunless %} {% capture read_prompt %} {{-
+site.data.locales[include.lang].post.read_time.prompt -}} {% endcapture %}
 
 <!-- return element -->
 <span
@@ -25,13 +17,10 @@
   title="{{ words }} {{ site.data.locales[include.lang].post.words }}"
 >
   <em>
-    {{- read_time -}}
-    {{ ' ' }}
-    {{- site.data.locales[include.lang].post.read_time.unit -}}
+    {{- read_time -}} {{ ' ' }} {{-
+    site.data.locales[include.lang].post.read_time.unit -}}
   </em>
-  {%- if include.prompt -%}
-    {%- assign _prompt_words = read_prompt | number_of_words: 'auto' -%}
-    {%- unless _prompt_words > 1 -%}{{ ' ' }}{%- endunless -%}
-    {{ read_prompt }}
-  {%- endif -%}
+  {%- if include.prompt -%} {%- assign _prompt_words = read_prompt |
+  number_of_words: 'auto' -%} {%- unless _prompt_words > 1 -%}{{ ' ' }}{%-
+  endunless -%} {{ read_prompt }} {%- endif -%}
 </span>
diff --git a/_includes/related-posts.html b/_includes/related-posts.html
index 1ba2f322008..390a32e73dc 100644
--- a/_includes/related-posts.html
+++ b/_includes/related-posts.html
@@ -7,90 +7,49 @@
 {% assign TAG_SCORE = 1 %}
 
 <!-- Equals to TAG_SCORE / {max_categories_hierarchy} -->
-{% assign CATEGORY_SCORE = 0.5 %}
-
-{% assign SEPARATOR = ':' %}
-
-{% assign match_posts = '' | split: '' %}
-
-{% for category in page.categories %}
-  {% assign match_posts = match_posts | push: site.categories[category] | uniq %}
-{% endfor %}
-
-{% for tag in page.tags %}
-  {% assign match_posts = match_posts | push: site.tags[tag] | uniq %}
-{% endfor %}
-
-{% assign last_index = match_posts.size | minus: 1 %}
-{% assign score_list = '' | split: '' %}
-
-{% for i in (0..last_index) %}
-  {% assign post = match_posts[i] %}
-
-  {% if post.url == page.url %}
-    {% continue %}
-  {% endif %}
-
-  {% assign score = 0 %}
-
-  {% for tag in post.tags %}
-    {% if page.tags contains tag %}
-      {% assign score = score | plus: TAG_SCORE %}
-    {% endif %}
-  {% endfor %}
-
-  {% for category in post.categories %}
-    {% if page.categories contains category %}
-      {% assign score = score | plus: CATEGORY_SCORE %}
-    {% endif %}
-  {% endfor %}
-
-  {% if score > 0 %}
-    {% capture score_item %}{{ score }}{{ SEPARATOR }}{{ i }}{% endcapture %}
-    {% assign score_list = score_list | push: score_item %}
-  {% endif %}
-{% endfor %}
-
-{% assign index_list = '' | split: '' %}
-
-{% if score_list.size > 0 %}
-  {% assign score_list = score_list | sort | reverse %}
-  {% for entry in score_list limit: TOTAL_SIZE %}
-    {% assign index = entry | split: SEPARATOR | last %}
-    {% assign index_list = index_list | push: index %}
-  {% endfor %}
-{% endif %}
-
-{% assign relate_posts = '' | split: '' %}
-
-{% for index in index_list %}
-  {% assign i = index | to_integer %}
-  {% assign relate_posts = relate_posts | push: match_posts[i] %}
-{% endfor %}
-
-{% if relate_posts.size > 0 %}
-  <aside id="related-posts" aria-labelledby="related-label">
-    <h3 class="mb-4" id="related-label">
-      {{- site.data.locales[include.lang].post.relate_posts -}}
-    </h3>
-    <nav class="row row-cols-1 row-cols-md-2 row-cols-xl-3 g-4 mb-4">
-      {% for post in relate_posts %}
-        <article class="col">
-          <a href="{{ post.url | relative_url }}" class="post-preview card h-100">
-            <div class="card-body">
-              {% include datetime.html date=post.date lang=include.lang %}
-              <h4 class="pt-0 my-2">{{ post.title }}</h4>
-              <div class="text-muted">
-                <p>
-                  {% include no-linenos.html content=post.content %}
-                  {{ content | markdownify | strip_html | truncate: 200 | escape }}
-                </p>
-              </div>
-            </div>
-          </a>
-        </article>
-      {% endfor %}
-    </nav>
-  </aside>
-  <!-- #related-posts -->
+{% assign CATEGORY_SCORE = 0.5 %} {% assign SEPARATOR = ':' %} {% assign
+match_posts = '' | split: '' %} {% for category in page.categories %} {% assign
+match_posts = match_posts | push: site.categories[category] | uniq %} {% endfor
+%} {% for tag in page.tags %} {% assign match_posts = match_posts | push:
+site.tags[tag] | uniq %} {% endfor %} {% assign last_index = match_posts.size |
+minus: 1 %} {% assign score_list = '' | split: '' %} {% for i in (0..last_index)
+%} {% assign post = match_posts[i] %} {% if post.url == page.url %} {% continue
+%} {% endif %} {% assign score = 0 %} {% for tag in post.tags %} {% if page.tags
+contains tag %} {% assign score = score | plus: TAG_SCORE %} {% endif %} {%
+endfor %} {% for category in post.categories %} {% if page.categories contains
+category %} {% assign score = score | plus: CATEGORY_SCORE %} {% endif %} {%
+endfor %} {% if score > 0 %} {% capture score_item %}{{ score }}{{ SEPARATOR
+}}{{ i }}{% endcapture %} {% assign score_list = score_list | push: score_item
+%} {% endif %} {% endfor %} {% assign index_list = '' | split: '' %} {% if
+score_list.size > 0 %} {% assign score_list = score_list | sort | reverse %} {%
+for entry in score_list limit: TOTAL_SIZE %} {% assign index = entry | split:
+SEPARATOR | last %} {% assign index_list = index_list | push: index %} {% endfor
+%} {% endif %} {% assign relate_posts = '' | split: '' %} {% for index in
+index_list %} {% assign i = index | to_integer %} {% assign relate_posts =
+relate_posts | push: match_posts[i] %} {% endfor %} {% if relate_posts.size > 0
+%}
+<aside id="related-posts" aria-labelledby="related-label">
+  <h3 class="mb-4" id="related-label">
+    {{- site.data.locales[include.lang].post.relate_posts -}}
+  </h3>
+  <nav class="row row-cols-1 row-cols-md-2 row-cols-xl-3 g-4 mb-4">
+    {% for post in relate_posts %}
+    <article class="col">
+      <a href="{{ post.url | relative_url }}" class="post-preview card h-100">
+        <div class="card-body">
+          {% include datetime.html date=post.date lang=include.lang %}
+          <h4 class="pt-0 my-2">{{ post.title }}</h4>
+          <div class="text-muted">
+            <p>
+              {% include no-linenos.html content=post.content %} {{ content |
+              markdownify | strip_html | truncate: 200 | escape }}
+            </p>
+          </div>
+        </div>
+      </a>
+    </article>
+    {% endfor %}
+  </nav>
+</aside>
+<!-- #related-posts -->
 {% endif %}
diff --git a/_includes/search-loader.html b/_includes/search-loader.html
index be3ca8a69f5..783b93e0c2a 100644
--- a/_includes/search-loader.html
+++ b/_includes/search-loader.html
@@ -4,20 +4,19 @@
 -->
 
 {% capture result_elem %}
-  <article class="px-1 px-sm-2 px-lg-4 px-xl-0">
-    <header>
-      <h2><a href="{url}">{title}</a></h2>
-      <div class="post-meta d-flex flex-column flex-sm-row text-muted mt-1 mb-1">
-        {categories}
-        {tags}
-      </div>
-    </header>
-    <p>{snippet}</p>
-  </article>
+<article class="px-1 px-sm-2 px-lg-4 px-xl-0">
+  <header>
+    <h2><a href="{url}">{title}</a></h2>
+    <div class="post-meta d-flex flex-column flex-sm-row text-muted mt-1 mb-1">
+      {categories} {tags}
+    </div>
+  </header>
+  <p>{snippet}</p>
+</article>
+{% endcapture %} {% capture not_found %}
+<p class="mt-5">{{ site.data.locales[include.lang].search.no_results }}</p>
 {% endcapture %}
 
-{% capture not_found %}<p class="mt-5">{{ site.data.locales[include.lang].search.no_results }}</p>{% endcapture %}
-
 <script>
   /* Note: dependent library will be loaded in `js-selector.html` */
   SimpleJekyllSearch({
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index b8f92e37e9d..6e25dca0c79 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -95,5 +95,9 @@ <h1 class="site-title">
     {% endfor %}
   </div>
   <!-- .sidebar-bottom -->
+<<<<<<< HEAD
 </aside>
+=======
+</div>
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))
 <!-- #sidebar -->
diff --git a/_includes/toc.html b/_includes/toc.html
index 604d2c1658e..1814ecdd64f 100644
--- a/_includes/toc.html
+++ b/_includes/toc.html
@@ -1,13 +1,10 @@
-{% assign enable_toc = false %}
-{% if site.toc and page.toc %}
-  {% if page.content contains '<h2' or page.content contains '<h3' %}
-    {% assign enable_toc = true %}
-  {% endif %}
-{% endif %}
-
-{% if enable_toc %}
-  <section id="toc-wrapper" class="ps-0 pe-4">
-    <h2 class="panel-heading ps-3 pt-2 mb-2">{{- site.data.locales[include.lang].panel.toc -}}</h2>
-    <nav id="toc"></nav>
-  </section>
+{% assign enable_toc = false %} {% if site.toc and page.toc %} {% if
+page.content contains '<h2' or page.content contains '<h3' %} {% assign
+enable_toc = true %} {% endif %} {% endif %} {% if enable_toc %}
+<section id="toc-wrapper" class="ps-0 pe-4">
+  <h2 class="panel-heading ps-3 pt-2 mb-2">
+    {{- site.data.locales[include.lang].panel.toc -}}
+  </h2>
+  <nav id="toc"></nav>
+</section>
 {% endif %}
diff --git a/_includes/topbar.html b/_includes/topbar.html
index d85101ac72e..76cfc469e71 100644
--- a/_includes/topbar.html
+++ b/_includes/topbar.html
@@ -6,37 +6,33 @@
     class="d-flex align-items-center justify-content-between px-lg-3 h-100"
   >
     <nav id="breadcrumb" aria-label="Breadcrumb">
-      {% assign paths = page.url | split: '/' %}
+      {% assign paths = page.url | split: '/' %} {% if paths.size == 0 or
+      page.layout == 'home' %}
+      <!-- index page -->
+      <span>{{ site.data.locales[include.lang].tabs.home | capitalize }}</span>
 
-      {% if paths.size == 0 or page.layout == 'home' %}
-        <!-- index page -->
-        <span>{{ site.data.locales[include.lang].tabs.home | capitalize }}</span>
+      {% else %} {% for item in paths %} {% if forloop.first %}
+      <span>
+        <a href="{{ '/' | relative_url }}">
+          {{- site.data.locales[include.lang].tabs.home | capitalize -}}
+        </a>
+      </span>
 
+      {% elsif forloop.last %} {% if page.collection == 'tabs' %}
+      <span
+        >{{ site.data.locales[include.lang].tabs[item] | default: page.title
+        }}</span
+      >
       {% else %}
-        {% for item in paths %}
-          {% if forloop.first %}
-            <span>
-              <a href="{{ '/' | relative_url }}">
-                {{- site.data.locales[include.lang].tabs.home | capitalize -}}
-              </a>
-            </span>
-
-          {% elsif forloop.last %}
-            {% if page.collection == 'tabs' %}
-              <span>{{ site.data.locales[include.lang].tabs[item] | default: page.title }}</span>
-            {% else %}
-              <span>{{ page.title }}</span>
-            {% endif %}
-
-          {% elsif page.layout == 'category' or page.layout == 'tag' %}
-            <span>
-              <a href="{{ item | append: '/' | relative_url }}">
-                {{- site.data.locales[include.lang].tabs[item] | default: page.title -}}
-              </a>
-            </span>
-          {% endif %}
-        {% endfor %}
-      {% endif %}
+      <span>{{ page.title }}</span>
+      {% endif %} {% elsif page.layout == 'category' or page.layout == 'tag' %}
+      <span>
+        <a href="{{ item | append: '/' | relative_url }}">
+          {{- site.data.locales[include.lang].tabs[item] | default: page.title
+          -}}
+        </a>
+      </span>
+      {% endif %} {% endfor %} {% endif %}
     </nav>
     <!-- endof #breadcrumb -->
 
@@ -45,14 +41,13 @@
     </button>
 
     <div id="topbar-title">
-      {% if page.layout == 'home' %}
-        {{- site.data.locales[include.lang].title | default: site.title -}}
-      {% elsif page.collection == 'tabs' or page.layout == 'page' %}
-        {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
-        {{- site.data.locales[include.lang].tabs[tab_key] | default: page.title -}}
-      {% else %}
-        {{- site.data.locales[include.lang].layout[page.layout] | default: page.layout | capitalize -}}
-      {% endif %}
+      {% if page.layout == 'home' %} {{- site.data.locales[include.lang].title |
+      default: site.title -}} {% elsif page.collection == 'tabs' or page.layout
+      == 'page' %} {%- capture tab_key -%}{{ page.url | split: '/' }}{%-
+      endcapture -%} {{- site.data.locales[include.lang].tabs[tab_key] |
+      default: page.title -}} {% else %} {{-
+      site.data.locales[include.lang].layout[page.layout] | default: page.layout
+      | capitalize -}} {% endif %}
     </div>
 
     <button type="button" id="search-trigger" class="btn btn-link">
@@ -68,9 +63,13 @@
         aria-label="search"
         autocomplete="off"
         placeholder="{{ site.data.locales[include.lang].search.hint | capitalize }}..."
-      >
+      />
     </search>
-    <button type="button" class="btn btn-link text-decoration-none" id="search-cancel">
+    <button
+      type="button"
+      class="btn btn-link text-decoration-none"
+      id="search-cancel"
+    >
       {{- site.data.locales[include.lang].search.cancel -}}
     </button>
   </div>
diff --git a/_includes/trending-tags.html b/_includes/trending-tags.html
index 57369f0d63e..3192f3b0931 100644
--- a/_includes/trending-tags.html
+++ b/_includes/trending-tags.html
@@ -1,46 +1,28 @@
 <!-- The trending tags list -->
 
-{% assign MAX = 10 %}
-
-{% assign size_list = '' | split: '' %}
-{% assign tag_list = '' | split: '' %}
-
-{% for tag in site.tags %}
-  {% assign size = tag | last | size %}
-  {% assign size_list = size_list | push: size %}
-
-  {% assign tag_str = tag | first | append: '::' | append: size %}
-  {% assign tag_list = tag_list | push: tag_str %}
-{% endfor %}
-
-{% assign size_list = size_list | sort | reverse %}
-
-{% assign tag_list = tag_list | sort_natural %}
-
-{% assign trending_tags = '' | split: '' %}
-
-{% for size in size_list limit: MAX %}
-  {% for tag_str in tag_list %}
-    {% assign tag = tag_str | split: '::' %}
-    {% assign tag_name = tag | first %}
-    {% assign tag_size = tag | last | plus: 0 %}
-    {% if tag_size == size %}
-      {% unless trending_tags contains tag_name %}
-        {% assign trending_tags = trending_tags | push: tag_name %}
-        {% break %}
-      {% endunless %}
-    {% endif %}
-  {% endfor %}
-{% endfor %}
-
-{% if trending_tags.size > 0 %}
-  <section>
-    <h2 class="panel-heading">{{- site.data.locales[include.lang].panel.trending_tags -}}</h2>
-    <div class="d-flex flex-wrap mt-3 mb-1 me-3">
-      {% for tag_name in trending_tags %}
-        {% assign url = tag_name | slugify | url_encode | prepend: '/tags/' | append: '/' %}
-        <a class="post-tag btn btn-outline-primary" href="{{ url | relative_url }}">{{ tag_name }}</a>
-      {% endfor %}
-    </div>
-  </section>
+{% assign MAX = 10 %} {% assign size_list = '' | split: '' %} {% assign tag_list
+= '' | split: '' %} {% for tag in site.tags %} {% assign size = tag | last |
+size %} {% assign size_list = size_list | push: size %} {% assign tag_str = tag
+| first | append: '::' | append: size %} {% assign tag_list = tag_list | push:
+tag_str %} {% endfor %} {% assign size_list = size_list | sort | reverse %} {%
+assign tag_list = tag_list | sort_natural %} {% assign trending_tags = '' |
+split: '' %} {% for size in size_list limit: MAX %} {% for tag_str in tag_list
+%} {% assign tag = tag_str | split: '::' %} {% assign tag_name = tag | first %}
+{% assign tag_size = tag | last | plus: 0 %} {% if tag_size == size %} {% unless
+trending_tags contains tag_name %} {% assign trending_tags = trending_tags |
+push: tag_name %} {% break %} {% endunless %} {% endif %} {% endfor %} {% endfor
+%} {% if trending_tags.size > 0 %}
+<section>
+  <h2 class="panel-heading">
+    {{- site.data.locales[include.lang].panel.trending_tags -}}
+  </h2>
+  <div class="d-flex flex-wrap mt-3 mb-1 me-3">
+    {% for tag_name in trending_tags %} {% assign url = tag_name | slugify |
+    url_encode | prepend: '/tags/' | append: '/' %}
+    <a class="post-tag btn btn-outline-primary" href="{{ url | relative_url }}"
+      >{{ tag_name }}</a
+    >
+    {% endfor %}
+  </div>
+</section>
 {% endif %}
diff --git a/_includes/update-list.html b/_includes/update-list.html
index 93684c3ef9d..d12d3398bff 100644
--- a/_includes/update-list.html
+++ b/_includes/update-list.html
@@ -1,40 +1,25 @@
 <!-- Get 5 last posted/updated posts -->
 
-{% assign MAX_SIZE = 5 %}
-
-{% assign all_list = '' | split: '' %}
-
-{% for post in site.posts %}
-  {% assign datetime = post.last_modified_at | default: post.date %}
-
-  {% capture elem %}
-    {{- datetime | date: "%Y%m%d%H%M%S" -}}::{{- forloop.index0 -}}
-  {% endcapture %}
-
-  {% assign all_list = all_list | push: elem %}
-{% endfor %}
-
-{% assign all_list = all_list | sort | reverse %}
-
-{% assign update_list = '' | split: '' %}
-
-{% for entry in all_list limit: MAX_SIZE %}
-  {% assign update_list = update_list | push: entry %}
-{% endfor %}
-
-{% if update_list.size > 0 %}
-  <section id="access-lastmod">
-    <h2 class="panel-heading">{{- site.data.locales[include.lang].panel.lastmod -}}</h2>
-    <ul class="content list-unstyled ps-0 pb-1 ms-1 mt-2">
-      {% for item in update_list %}
-        {% assign index = item | split: '::' | last | plus: 0 %}
-        {% assign post = site.posts[index] %}
-        {% assign url = post.url | relative_url %}
-        <li class="text-truncate lh-lg">
-          <a href="{{ url }}">{{ post.title }}</a>
-        </li>
-      {% endfor %}
-    </ul>
-  </section>
-  <!-- #access-lastmod -->
+{% assign MAX_SIZE = 5 %} {% assign all_list = '' | split: '' %} {% for post in
+site.posts %} {% assign datetime = post.last_modified_at | default: post.date %}
+{% capture elem %} {{- datetime | date: "%Y%m%d%H%M%S" -}}::{{- forloop.index0
+-}} {% endcapture %} {% assign all_list = all_list | push: elem %} {% endfor %}
+{% assign all_list = all_list | sort | reverse %} {% assign update_list = '' |
+split: '' %} {% for entry in all_list limit: MAX_SIZE %} {% assign update_list =
+update_list | push: entry %} {% endfor %} {% if update_list.size > 0 %}
+<section id="access-lastmod">
+  <h2 class="panel-heading">
+    {{- site.data.locales[include.lang].panel.lastmod -}}
+  </h2>
+  <ul class="content list-unstyled ps-0 pb-1 ms-1 mt-2">
+    {% for item in update_list %} {% assign index = item | split: '::' | last |
+    plus: 0 %} {% assign post = site.posts[index] %} {% assign url = post.url |
+    relative_url %}
+    <li class="text-truncate lh-lg">
+      <a href="{{ url }}">{{ post.title }}</a>
+    </li>
+    {% endfor %}
+  </ul>
+</section>
+<!-- #access-lastmod -->
 {% endif %}
diff --git a/_layouts/categories.html b/_layouts/categories.html
index 05150970493..0848a5c838e 100644
--- a/_layouts/categories.html
+++ b/_layouts/categories.html
@@ -3,136 +3,110 @@
 # All the Categories of posts
 ---
 
-{% include lang.html %}
-
-{% assign HEAD_PREFIX = 'h_' %}
-{% assign LIST_PREFIX = 'l_' %}
-
-{% assign group_index = 0 %}
-
-{% assign sort_categories = site.categories | sort %}
-
-{% for category in sort_categories %}
-  {% assign category_name = category | first %}
-  {% assign posts_of_category = category | last %}
-  {% assign first_post = posts_of_category | first %}
-
-  {% if category_name == first_post.categories[0] %}
-    {% assign sub_categories = '' | split: '' %}
-
-    {% for post in posts_of_category %}
-      {% assign second_category = post.categories[1] %}
-      {% if second_category %}
-        {% unless sub_categories contains second_category %}
-          {% assign sub_categories = sub_categories | push: second_category %}
-        {% endunless %}
-      {% endif %}
-    {% endfor %}
-
-    {% assign sub_categories = sub_categories | sort %}
-    {% assign sub_categories_size = sub_categories | size %}
-
-    <div class="card categories">
-      <!-- top-category -->
-      <div
-        id="{{ HEAD_PREFIX }}{{ group_index }}"
-        class="card-header d-flex justify-content-between hide-border-bottom"
+{% include lang.html %} {% assign HEAD_PREFIX = 'h_' %} {% assign LIST_PREFIX =
+'l_' %} {% assign group_index = 0 %} {% assign sort_categories = site.categories
+| sort %} {% for category in sort_categories %} {% assign category_name =
+category | first %} {% assign posts_of_category = category | last %} {% assign
+first_post = posts_of_category | first %} {% if category_name ==
+first_post.categories[0] %} {% assign sub_categories = '' | split: '' %} {% for
+post in posts_of_category %} {% assign second_category = post.categories[1] %}
+{% if second_category %} {% unless sub_categories contains second_category %} {%
+assign sub_categories = sub_categories | push: second_category %} {% endunless
+%} {% endif %} {% endfor %} {% assign sub_categories = sub_categories | sort %}
+{% assign sub_categories_size = sub_categories | size %}
+
+<div class="card categories">
+  <!-- top-category -->
+  <div
+    id="{{ HEAD_PREFIX }}{{ group_index }}"
+    class="card-header d-flex justify-content-between hide-border-bottom"
+  >
+    <span class="ms-2">
+      <i
+        class="far fa-folder{% if sub_categories_size > 0 %}-open{% endif %} fa-fw"
+      ></i>
+
+      {% capture _category_url %}/categories/{{ category_name | slugify |
+      url_encode }}/{% endcapture %}
+      <a href="{{ _category_url | relative_url }}" class="mx-2"
+        >{{ category_name }}</a
       >
-        <span class="ms-2">
-          <i class="far fa-folder{% if sub_categories_size > 0 %}-open{% endif %} fa-fw"></i>
-
-          {% capture _category_url %}/categories/{{ category_name | slugify | url_encode }}/{% endcapture %}
-          <a href="{{ _category_url | relative_url }}" class="mx-2">{{ category_name }}</a>
 
-          <!-- content count -->
-          {% assign top_posts_size = site.categories[category_name] | size %}
-          <span class="text-muted small font-weight-light">
-            {% 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
-                }}
-              {% 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 %}
-          </span>
+      <!-- content count -->
+      {% assign top_posts_size = site.categories[category_name] | size %}
+      <span class="text-muted small font-weight-light">
+        {% 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 }} {% 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 %}
+      </span>
+    </span>
+
+    <!-- arrow -->
+    {% if sub_categories_size > 0 %}
+    <a
+      href="#{{ LIST_PREFIX }}{{ group_index }}"
+      data-bs-toggle="collapse"
+      aria-expanded="true"
+      aria-label="{{ HEAD_PREFIX }}{{ group_index }}-trigger"
+      class="category-trigger hide-border-bottom"
+    >
+      <i class="fas fa-fw fa-angle-down"></i>
+    </a>
+    {% else %}
+    <span
+      data-bs-toggle="collapse"
+      class="category-trigger hide-border-bottom disabled"
+    >
+      <i class="fas fa-fw fa-angle-right"></i>
+    </span>
+    {% endif %}
+  </div>
+  <!-- .card-header -->
+
+  <!-- Sub-categories -->
+  {% if sub_categories_size > 0 %}
+  <div
+    id="{{ LIST_PREFIX }}{{ group_index }}"
+    class="collapse show"
+    aria-expanded="true"
+  >
+    <ul class="list-group">
+      {% for sub_category in sub_categories %}
+      <li class="list-group-item">
+        <i class="far fa-folder fa-fw"></i>
+
+        {% capture _sub_ctg_url %}/categories/{{ sub_category | slugify |
+        url_encode }}/{% endcapture %} <<<<<<< HEAD
+        <a href="{{ _sub_ctg_url | relative_url }}" class="mx-2"
+          >{{ sub_category }}</a
+        >
+        =======
+        <a href="{{ _sub_ctg_url | relative_url }}" class="ml-1 mr-2"
+          >{{ sub_category }}</a
+        >
+        >>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en"
+        (#979)) {% assign posts_size = site.categories[sub_category] | size %}
+        <span class="text-muted small font-weight-light">
+          {{ posts_size }} {% 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>
-
-        <!-- arrow -->
-        {% if sub_categories_size > 0 %}
-          <a
-            href="#{{ LIST_PREFIX }}{{ group_index }}"
-            data-bs-toggle="collapse"
-            aria-expanded="true"
-            aria-label="{{ HEAD_PREFIX }}{{ group_index }}-trigger"
-            class="category-trigger hide-border-bottom"
-          >
-            <i class="fas fa-fw fa-angle-down"></i>
-          </a>
-        {% else %}
-          <span data-bs-toggle="collapse" class="category-trigger hide-border-bottom disabled">
-            <i class="fas fa-fw fa-angle-right"></i>
-          </span>
-        {% endif %}
-      </div>
-      <!-- .card-header -->
-
-      <!-- Sub-categories -->
-      {% if sub_categories_size > 0 %}
-        <div id="{{ LIST_PREFIX }}{{ group_index }}" class="collapse show" aria-expanded="true">
-          <ul class="list-group">
-            {% for sub_category in sub_categories %}
-              <li class="list-group-item">
-                <i class="far fa-folder fa-fw"></i>
-
-                {% capture _sub_ctg_url %}/categories/{{ sub_category | slugify | url_encode }}/{% endcapture %}
-                <a href="{{ _sub_ctg_url | relative_url }}" class="mx-2">{{ sub_category }}</a>
-
-                {% assign posts_size = site.categories[sub_category] | size %}
-                <span class="text-muted small font-weight-light">
-                  {{ posts_size }}
-
-                  {% 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 %}
-          </ul>
-        </div>
-      {% endif %}
-    </div>
-    <!-- .card -->
-
-    {% assign group_index = group_index | plus: 1 %}
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
   {% endif %}
-{% endfor %}
+</div>
+<!-- .card -->
+
+{% assign group_index = group_index | plus: 1 %} {% endif %} {% endfor %}
diff --git a/_layouts/category.html b/_layouts/category.html
index b064f27c943..68273d47460 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -14,11 +14,12 @@ <h1 class="ps-lg-2">
 
   <ul class="content ps-0">
     {% for post in page.posts %}
-      <li class="d-flex justify-content-between px-md-3">
-        <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-        <span class="dash flex-grow-1"></span>
-        {% include datetime.html date=post.date class='text-muted small text-nowrap' lang=lang %}
-      </li>
+    <li class="d-flex justify-content-between px-md-3">
+      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
+      <span class="dash flex-grow-1"></span>
+      {% include datetime.html date=post.date class='text-muted small
+      text-nowrap' lang=lang %}
+    </li>
     {% endfor %}
   </ul>
 </div>
diff --git a/_layouts/default.html b/_layouts/default.html
index f938a94247b..9dff67219e0 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,16 +8,31 @@
 
 {% include lang.html %}
 
+<<<<<<< HEAD
 {% if site.theme_mode %}
   {% capture prefer_mode %}data-mode="{{ site.theme_mode }}"{% endcapture %}
 {% endif %}
+=======
+{% capture prefer_mode %}
+  {% if site.theme_mode %}
+    data-mode="{{ site.theme_mode }}"
+  {% endif %}
+{% endcapture %}
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))
 
 <!-- `site.alt_lang` can specify a language different from the UI -->
 <html lang="{{ site.alt_lang | default: site.lang }}" {{ prefer_mode }}>
   {% include head.html %}
 
+<<<<<<< HEAD
   <body>
     {% include sidebar.html lang=lang %}
+=======
+  <body data-topbar-visible="true">
+    {% include sidebar.html lang=lang %}
+
+    {% include topbar.html lang=lang %}
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))
 
     <div id="main-wrapper" class="d-flex justify-content-center">
       <div class="container d-flex flex-column px-xxl-5">
@@ -61,6 +76,7 @@
         {% include_cached search-results.html lang=lang %}
       </div>
 
+<<<<<<< HEAD
       <aside aria-label="Scroll to Top">
         <button id="back-to-top" type="button" class="btn btn-lg btn-box-shadow">
           <i class="fas fa-angle-up"></i>
@@ -77,11 +93,54 @@
     <!-- JavaScripts -->
 
     {% include js-selector.html %}
+=======
+      {% include search-results.html lang=lang %}
+    </div>
+    <!-- #main-wrapper -->
+
+    {% include footer.html lang=lang %}
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))
 
     {% if page.mermaid %}
       {% include mermaid.html %}
     {% endif %}
 
+<<<<<<< HEAD
     {% include_cached search-loader.html %}
+=======
+    <div id="mask"></div>
+
+    <a id="back-to-top" href="#" aria-label="back-to-top" class="btn btn-lg btn-box-shadow" role="button">
+      <i class="fas fa-angle-up"></i>
+    </a>
+
+    {% if site.pwa.enabled %}
+      <div
+        id="notification"
+        class="toast"
+        role="alert"
+        aria-live="assertive"
+        aria-atomic="true"
+        data-animation="true"
+        data-autohide="false"
+      >
+        <div class="toast-header">
+          <button type="button" class="ml-2 ml-auto close" data-dismiss="toast" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </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>
+          <button type="button" class="btn btn-primary" aria-label="Update">
+            {{ site.data.locales[lang].notification.update }}
+          </button>
+        </div>
+      </div>
+    {% endif %}
+
+    {% include search-loader.html %}
+
+    {% include js-selector.html %}
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))
   </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
index 32d6582a15b..2c538dacf61 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,16 +5,10 @@
 {% include lang.html %}
 
 <article class="px-1">
-  {% 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 %}
-    <h1 class="dynamic-title">
-      {{ title }}
-    </h1>
-    <div class="content">
-      {{ content }}
-    </div>
-  {% else %}
-    {{ content }}
-  {% endif %}
+  {% 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 %}
+  <h1 class="dynamic-title">{{ title }}</h1>
+  <div class="content">{{ content }}</div>
+  {% else %} {{ content }} {% endif %}
 </article>
diff --git a/_layouts/post.html b/_layouts/post.html
index f7818bf6e0f..d475507d9d9 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -18,58 +18,52 @@ <h1 data-toc-skip>{{ page.title }}</h1>
     <div class="post-meta text-muted">
       <!-- published date -->
       <span>
-        {{ site.data.locales[lang].post.posted }}
-        {% include datetime.html date=page.date tooltip=true lang=lang %}
+        {{ site.data.locales[lang].post.posted }} {% include datetime.html
+        date=page.date tooltip=true lang=lang %}
       </span>
 
       <!-- lastmod date -->
       {% if page.last_modified_at and page.last_modified_at != page.date %}
-        <span>
-          {{ site.data.locales[lang].post.updated }}
-          {% include datetime.html date=page.last_modified_at tooltip=true lang=lang %}
-        </span>
-      {% endif %}
-
-      {% if page.image %}
-        {% capture src %}src="{{ page.image.path | default: page.image }}"{% endcapture %}
-        {% capture class %}class="preview-img{% if page.image.no_bg %}{{ ' no-bg' }}{% endif %}"{% endcapture %}
-        {% capture alt %}alt="{{ page.image.alt | xml_escape | default: "Preview Image" }}"{% endcapture %}
-
-        {% if page.image.lqip %}
-          {%- capture lqip -%}lqip="{{ page.image.lqip }}"{%- endcapture -%}
-        {% endif %}
-
-        <div class="mt-3 mb-3">
-          <img {{ src }} {{ class }} {{ alt }} w="1200" h="630" {{ lqip }}>
-          {%- if page.image.alt -%}
-            <figcaption class="text-center pt-2 pb-2">{{ page.image.alt }}</figcaption>
-          {%- endif -%}
-        </div>
+      <span>
+        {{ site.data.locales[lang].post.updated }} {% include datetime.html
+        date=page.last_modified_at tooltip=true lang=lang %}
+      </span>
+      {% endif %} {% if page.image %} {% capture src %}src="{{ page.image.path |
+      default: page.image }}"{% endcapture %} {% capture class
+      %}class="preview-img{% if page.image.no_bg %}{{ ' no-bg' }}{% endif %}"{%
+      endcapture %} {% capture alt %}alt="{{ page.image.alt | xml_escape |
+      default: "Preview Image" }}"{% endcapture %} {% if page.image.lqip %} {%-
+      capture lqip -%}lqip="{{ page.image.lqip }}"{%- endcapture -%} {% endif %}
+
+      <div class="mt-3 mb-3">
+        <img {{ src }} {{ class }} {{ alt }} w="1200" h="630" {{ lqip }} />
+        {%- if page.image.alt -%}
+        <figcaption class="text-center pt-2 pb-2">
+          {{ page.image.alt }}
+        </figcaption>
+        {%- endif -%}
+      </div>
       {% endif %}
 
       <div class="d-flex justify-content-between">
         <!-- author(s) -->
         <span>
-          {% if page.author %}
-            {% assign authors = page.author %}
-          {% elsif page.authors %}
-            {% assign authors = page.authors %}
-          {% endif %}
-
-          {{ site.data.locales[lang].post.written_by }}
+          {% if page.author %} {% assign authors = page.author %} {% elsif
+          page.authors %} {% assign authors = page.authors %} {% endif %} {{
+          site.data.locales[lang].post.written_by }}
 
           <em>
-            {% if authors %}
-              {% for author in authors %}
-                {% if site.data.authors[author].url -%}
-                  <a href="{{ site.data.authors[author].url }}">{{ site.data.authors[author].name }}</a>
-                {%- else -%}
-                  {{ site.data.authors[author].name }}
-                {%- endif %}
-                {% unless forloop.last %}{{ '</em>, <em>' }}{% endunless %}
-              {% endfor %}
-            {% else %}
-              <a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>
+            {% if authors %} {% for author in authors %} {% if
+            site.data.authors[author].url -%}
+            <a href="{{ site.data.authors[author].url }}"
+              >{{ site.data.authors[author].name }}</a
+            >
+            {%- else -%} {{ site.data.authors[author].name }} {%- endif %} {%
+            unless forloop.last %}{{ '</em
+          >,
+          <em
+            >' }}{% endunless %} {% endfor %} {% else %}
+            <a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>
             {% endif %}
           </em>
         </span>
@@ -82,53 +76,48 @@ <h1 data-toc-skip>{{ page.title }}</h1>
     <!-- .post-meta -->
   </header>
 
-  <div class="content">
-    {{ content }}
-  </div>
+  <div class="content">{{ content }}</div>
 
   <div class="post-tail-wrapper text-muted">
     <!-- categories -->
     {% if page.categories.size > 0 %}
-      <div class="post-meta mb-3">
-        <i class="far fa-folder-open fa-fw me-1"></i>
-        {% for category in page.categories %}
-          <a href="{{ site.baseurl }}/categories/{{ category | slugify | url_encode }}/">{{ category }}</a>
-          {%- unless forloop.last -%},{%- endunless -%}
-        {% endfor %}
-      </div>
+    <div class="post-meta mb-3">
+      <i class="far fa-folder-open fa-fw me-1"></i>
+      {% for category in page.categories %}
+      <a
+        href="{{ site.baseurl }}/categories/{{ category | slugify | url_encode }}/"
+        >{{ category }}</a
+      >
+      {%- unless forloop.last -%},{%- endunless -%} {% endfor %}
+    </div>
     {% endif %}
 
     <!-- tags -->
     {% if page.tags.size > 0 %}
-      <div class="post-tags">
-        <i class="fa fa-tags fa-fw me-1"></i>
-        {% for tag in page.tags %}
-          <a
-            href="{{ site.baseurl }}/tags/{{ tag | slugify | url_encode }}/"
-            class="post-tag no-text-decoration"
-          >
-            {{- tag -}}
-          </a>
-        {% endfor %}
-      </div>
+    <div class="post-tags">
+      <i class="fa fa-tags fa-fw me-1"></i>
+      {% for tag in page.tags %}
+      <a
+        href="{{ site.baseurl }}/tags/{{ tag | slugify | url_encode }}/"
+        class="post-tag no-text-decoration"
+      >
+        {{- tag -}}
+      </a>
+      {% endfor %}
+    </div>
     {% endif %}
 
     <div
-      class="
-        post-tail-bottom
-        d-flex justify-content-between align-items-center mt-5 pb-2
-      "
+      class="post-tail-bottom d-flex justify-content-between align-items-center mt-5 pb-2"
     >
       <div class="license-wrapper">
-        {% if site.data.locales[lang].copyright.license.template %}
-          {% capture _replacement %}
+        {% if site.data.locales[lang].copyright.license.template %} {% capture
+        _replacement %}
         <a href="{{ site.data.locales[lang].copyright.license.link }}">
           {{ site.data.locales[lang].copyright.license.name }}
         </a>
-        {% endcapture %}
-
-          {{ site.data.locales[lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
-        {% endif %}
+        {% endcapture %} {{ site.data.locales[lang].copyright.license.template |
+        replace: ':LICENSE_NAME', _replacement }} {% endif %}
       </div>
 
       {% include post-sharing.html lang=lang %}
diff --git a/_layouts/tag.html b/_layouts/tag.html
index d766d099d8c..b2e72d5b7d8 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -13,11 +13,12 @@ <h1 class="ps-lg-2">
   </h1>
   <ul class="content ps-0">
     {% for post in page.posts %}
-      <li class="d-flex justify-content-between px-md-3">
-        <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-        <span class="dash flex-grow-1"></span>
-        {% include datetime.html date=post.date class='text-muted small text-nowrap' lang=lang %}
-      </li>
+    <li class="d-flex justify-content-between px-md-3">
+      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
+      <span class="dash flex-grow-1"></span>
+      {% include datetime.html date=post.date class='text-muted small
+      text-nowrap' lang=lang %}
+    </li>
     {% endfor %}
   </ul>
 </div>
diff --git a/assets/404.html b/assets/404.html
index 5b46cc8c832..74c27a3d623 100644
--- a/assets/404.html
+++ b/assets/404.html
@@ -11,4 +11,10 @@
 
 {% include lang.html %}
 
+<<<<<<< HEAD
 <p class="lead">{{ site.data.locales[lang].not_found.statment }}</p>
+=======
+<div class="lead">
+  <p>{{ site.data.locales[lang].not_found.statment }}</p>
+</div>
+>>>>>>> 78a1f20 (perf(i18n): set the global default locales to "en" (#979))