refactor: remove site config option prefer_datetime_locale

cotes2020 · Oct 18, 2022 · 6852ceb · 6852ceb
1 parent f904e8c
commit 6852ceb
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 23 deletions.
diff --git a/_config.yml b/_config.yml
@@ -12,8 +12,6 @@ baseurl: ''
 # otherwise, the layout language will use the default value of 'en'.
 lang: en
 
-# Additional parameters for datetime localization, optional. › https://github.com/iamkun/dayjs/tree/dev/src/locale
-prefer_datetime_locale:
 
 # Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone
 timezone: Asia/Shanghai

diff --git a/_includes/head.html b/_includes/head.html
@@ -6,11 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-  <!-- Allow having a localized datetime different from the appearance language -->
-  {% if site.prefer_datetime_locale %}
-    <meta name="prefer-datetime-locale" content="{{ site.prefer_datetime_locale }}">
-  {% endif %}
-
   {% if page.layout == 'home' or page.layout == 'post' %}
 
     {% if site.google_analytics.pv.proxy_endpoint %}

diff --git a/_includes/js-selector.html b/_includes/js-selector.html
@@ -29,11 +29,7 @@
     or page.layout == 'category'
     or page.layout == 'tag' %}
 
-  {% if site.prefer_datetime_locale %}
-    {% assign locale = site.prefer_datetime_locale | downcase %}
-  {% else %}
-    {% assign locale = site.lang | split: '-' | first %}
-  {% endif %}
+  {% assign locale = site.lang | split: '-' | first %}
 
   {% assign _urls = site.data.assets[origin].dayjs.js.common
       | append: ',' | append: site.data.assets[origin].dayjs.js.locale

diff --git a/_javascript/utils/locale-datetime.js b/_javascript/utils/locale-datetime.js
@@ -6,9 +6,7 @@
 
 /* A tool for locale datetime */
 const LocaleHelper = (function () {
-  const $preferLocale = $('meta[name="prefer-datetime-locale"]');
-  const locale = $preferLocale.length > 0 ?
-      $preferLocale.attr('content').toLowerCase() : $('html').attr('lang').substr(0, 2);
+  const locale = $('html').attr('lang').substr(0, 2)
   const attrTimestamp = 'data-ts';
   const attrDateFormat = 'data-df';
 

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -15,7 +15,8 @@
   {% endif %}
 {% endcapture %}
 
-<html lang="{{ site.lang }}"{{ prefer_mode }}>
+<!-- `site.alt_lang` can specify a language different from the UI -->
+<html lang="{{ site.alt_lang | default: site.lang }}"{{ prefer_mode }}>
 
   {% include head.html %}
 

diff --git a/assets/js/dist/categories.min.js b/assets/js/dist/categories.min.js
diff --git a/assets/js/dist/commons.min.js b/assets/js/dist/commons.min.js