Merge branch 'dev'

_config.yml

@@ -515,12 +515,12 @@ share:
   # Share.js
   # https://github.com/overtrue/share.js
   sharejs:
-    sites: facebook,twitter,wechat,weibo,qq
+    sites: facebook,x,wechat,weibo,qq
 
   # AddToAny
   # https://www.addtoany.com/
   addtoany:
-    item: facebook,twitter,wechat,sina_weibo,facebook_messenger,email,copy_link
+    item: facebook,x,wechat,sina_weibo,facebook_messenger,email,copy_link
 
 # --------------------------------------
 # Comments System
@@ -1067,7 +1067,7 @@ CDN:
   third_party_provider: jsdelivr
 
   # Add version number to url, true or false
-  version: false
+  version: true
 
   # Custom format
   # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}

languages/zh-CN.yml

@@ -49,7 +49,7 @@ search:
 pagination:
   prev: 上一篇
   next: 下一篇
-  page_info: '第 ${current} 頁 / 共 ${total} 頁'
+  page_info: '第 ${current} 页 / 共 ${total} 页'
 
 comment: 评论
 

layout/includes/page/shuoshuo.pug

@@ -46,6 +46,9 @@
 
     - const localDate = page.shuoshuo_url ? [] : shuoshuoFN(site.data.shuoshuo, page)
 
+    if !page.shuoshuo_url
+      script(type='application/json' id='shuoshuo-data')!= safeJSON(localDate)
+
     script.
       (() => {
         const limitConfig = !{ JSON.stringify(page.limit || {}) }
@@ -280,7 +283,8 @@
               const response = await fetch('!{url_for(page.shuoshuo_url)}')
               originData = await response.json()
             } else {
-              originData = !{JSON.stringify(localDate)}
+              const dataElement = document.getElementById('shuoshuo-data')
+              originData = dataElement ? JSON.parse(dataElement.textContent) : []
             }
 
             data = filterDataByLimit(sortDataByDate(originData), limitConfig)