diff --git a/README.md b/README.md index edb6714..6f8cea4 100644 --- a/README.md +++ b/README.md @@ -172,9 +172,11 @@ List of Donors(Order desc by Date): | Donation time | Donors | Donation mode | Donation content | Message | | :-------: | ------ | ------ | ---- | ---- | -| 2022.09.30 | *軒 | wechat pay | ¥66.66 | Hope it could help more people. | -| 2022.09.30 | N*l | wechat pay | ¥20.00 | / | -| 2022.07.09 | *风 | wechat pay | ¥10.00 | / | -| 2022.05.08 | *泉 | wechat pay | ¥6.60 | Good luck with next develop. | -| 2022.02.28 | *娇 | wechat pay | ¥5.00 | / | -| 2021.12.21 | z*y | wechat pay | ¥18.88 | / | \ No newline at end of file +| 2023.06.01 | **霖 | alipay | RMB 10.00 | / | +| 2022.11.15 | f888 | xianyu | RMB 6.20 | Good luck. | +| 2022.09.30 | *軒 | wechat pay | RMB 66.66 | Hope it could help more people. | +| 2022.09.30 | N*l | wechat pay | RMB 20.00 | / | +| 2022.07.09 | *风 | wechat pay | RMB 10.00 | / | +| 2022.05.08 | *泉 | wechat pay | RMB 6.60 | Good luck with next develop. | +| 2022.02.28 | *娇 | wechat pay | RMB 5.00 | / | +| 2021.12.21 | z*y | wechat pay | RMB 18.88 | / | \ No newline at end of file diff --git a/README.zh.md b/README.zh.md index 32340ec..ea54e6b 100644 --- a/README.zh.md +++ b/README.zh.md @@ -181,6 +181,8 @@ Copyright (c) 2022， hugo-next 团队 | 打赏时间 | 打赏者 | 打赏方式 | 打赏内容 | 留言 | | :-------: | ------ | ------ | ---- | ---- | +| 2023.06.01 | **霖 | 支付宝 | ¥10.00 | / | +| 2022.11.15 | f888 | 咸鱼 | ¥6.20 | 聊表心意 | | 2022.09.30 | *軒 | 微信支付 | ¥66.66 | 愿项目造福更多人！ | | 2022.09.30 | N*l | 微信支付 | ¥20.00 | / | | 2022.07.09 | *风 | 微信支付 | ¥10.00 | / | diff --git a/VERSION b/VERSION index 4f3470c..ae15394 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.1 \ No newline at end of file +4.5.0 \ No newline at end of file diff --git a/assets/css/_common/components/pages/categories.scss b/assets/css/_common/components/pages/categories.scss index b79ac03..83d6d4b 100644 --- a/assets/css/_common/components/pages/categories.scss +++ b/assets/css/_common/components/pages/categories.scss @@ -15,14 +15,23 @@ list-style: none; margin: 0; padding: 0; - } - .category-list-item { - margin: 5px 10px; + .category-list-item:before { + font-family: var(--fa-style-family,"Font Awesome 6 Free"); + font-weight: var(--fa-style,900); + content: "\f07c"; + margin-right: 5px; + } + + .category-list-item { + margin: 5px 10px; + font-weight: bold; + } } .category-list-count { color: $grey; + padding: 0 2px; &::before { content: ' ('; @@ -33,7 +42,19 @@ } } - .category-list-child { - padding-left: 10px; + .category-children-list { + padding-left: 38px; + list-style: none; + + .category-children-list-item:before { + font-family: var(--fa-style-family,"Font Awesome 6 Free"); + font-weight: var(--fa-style,900); + content: "\f0ae"; + margin-right: 5px; + } + + .category-children-list-item { + font-size: 0.925em; + } } } diff --git a/assets/css/_common/components/post/post-footer.scss b/assets/css/_common/components/post/post-footer.scss index e8c4473..a7aa412 100644 --- a/assets/css/_common/components/post/post-footer.scss +++ b/assets/css/_common/components/post/post-footer.scss @@ -59,6 +59,10 @@ @include post-card(); border: none; background: none; + + li { + word-break: break-all; + } } } diff --git a/assets/css/_common/components/post/post-header.scss b/assets/css/_common/components/post/post-header.scss index d899968..b0b76f6 100644 --- a/assets/css/_common/components/post/post-header.scss +++ b/assets/css/_common/components/post/post-header.scss @@ -113,3 +113,8 @@ flex-basis: 100%; height: 0; } + +#comments-count { + cursor: pointer; + border-bottom: 1px solid $link-decoration-color; +} diff --git a/assets/css/main.scss b/assets/css/main.scss index 7d0f14e..1865bbd 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1,6 +1,6 @@ // CSS Style Guide : https://codeguide.co/#css // All variables from site's config content. -{{- $P := .Site.Params }} +{{ $P := .Site.Params }} // Base $scheme : {{ $P.scheme }}; $darkmode : {{ $P.darkmode }}; @@ -129,18 +129,18 @@ $disqusjs_enable : false; $livere_enable : {{ isset $P "livere" }}; $utterances_enable : {{ isset $P "utterances" }}; $waline_enable : {{ isset $P "waline" }}; -{{- with .Site.Params.comments }} -{{- $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }} +{{ with .Site.Params.comments }} +{{ $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }} $two_comments_enable : {{ $tce }}; -{{- if $tce }} -{{- $sortNav := sort .nav "weight" }} +{{ if $tce }} +{{ $sortNav := sort .nav "weight" }} $two_comments_actived : {{ .active }}; $first_comment_color : {{ (index $sortNav 0).color }}; $first_comment_name : {{ lower (index $sortNav 0).name }}; $second_comment_color : {{ (index $sortNav 1).color }}; $second_comment_name : {{ lower (index $sortNav 1).name }}; -{{- end }} -{{- end }} +{{ end }} +{{ end }} // // Variables Layer @@ -175,9 +175,4 @@ $second_comment_name : {{ lower (index $sortNav 1).name }}; // Schemes Layer // -------------------------------------------------- -{{ printf "@import '_schemes/%s/';" $P.scheme }} - -// Custom Layer -// TODO -// -------------------------------------------------- -// @import 'theme.injects.style'; +{{ printf "@import '_schemes/%s/';" $P.scheme }} \ No newline at end of file diff --git a/assets/js/next-boot.js b/assets/js/next-boot.js index 8b55d29..47339f6 100644 --- a/assets/js/next-boot.js +++ b/assets/js/next-boot.js @@ -24,6 +24,14 @@ NexT.boot.registerEvents = function() { // Register comment's components NexT.plugins.register(); + // Register comment counter click event + const commentCnt = document.querySelector('#comments-count'); + if (commentCnt && NexT.CONFIG.page.isPage) { + commentCnt.addEventListener('click', event => { + NexT.utils.slidScrollBarAnime('comments'); + }); + } + // Mobile top menu bar. document.querySelector('.site-nav-toggle .toggle').addEventListener('click', event => { event.currentTarget.classList.toggle('toggle-close'); @@ -62,7 +70,7 @@ NexT.boot.refresh = function() { NexT.utils.registerCommonSwitch(); NexT.utils.domAddClass('#goto-comments', 'goto-comments-on'); } else { - NexT.utils.hideCommontes(); + NexT.utils.hideComments(); } NexT.utils.registerImageViewer(); diff --git a/assets/js/third-party/others/counter.js b/assets/js/third-party/others/counter.js index 6027bee..8cb9098 100644 --- a/assets/js/third-party/others/counter.js +++ b/assets/js/third-party/others/counter.js @@ -1,35 +1,31 @@ /* Page's view & comment counter plugin */ NexT.plugins.others.counter = function() { - let busz_postview = false; let pageview_js = undefined; let comment_js = undefined; - const busz = NexT.CONFIG.busuanzi; - if (busz != undefined && busz.pageview) { - busz_postview = true; - } + const post_meta = NexT.CONFIG.postmeta; - // Here can append others pageview & comment plugin - const waline = NexT.CONFIG.waline; - if (waline != undefined){ - if(!busz_postview && waline.cfg.pageview) { - pageview_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[0]); - NexT.utils.getScript(pageview_js, function(){ - Waline.pageviewCount({ - serverURL: waline.cfg.serverurl + const views = post_meta.views; + if(views != undefined && views.enable) { + if (views.plugin == 'waline') { + pageview_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[0]); + NexT.utils.getScript(pageview_js, function(){ + Waline.pageviewCount({ + serverURL: NexT.CONFIG.waline.cfg.serverurl + }); }); - }); + } } - if (waline.cfg.comment) { - comment_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[1]); - NexT.utils.getScript(comment_js, function(){ - Waline.commentCount({ - serverURL: waline.cfg.serverurl + const comments = post_meta.comments; + if (comments != undefined && comments.enable) { + if (comments.plugin == 'waline') { + comment_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[1]); + NexT.utils.getScript(comment_js, function(){ + Waline.commentCount({ + serverURL: NexT.CONFIG.waline.cfg.serverurl + }); }); - }); + } } - } - - } \ No newline at end of file diff --git a/assets/js/utils.js b/assets/js/utils.js index 2ef2605..e78675e 100644 --- a/assets/js/utils.js +++ b/assets/js/utils.js @@ -59,11 +59,13 @@ NexT.utils = { }, slidScrollBarAnime: function (targetId, easing = 'linear', duration = 500) { + const targetObj = document.getElementById(targetId); + window.anime({ targets: document.scrollingElement, duration: duration, easing: easing, - scrollTop: targetId == '' ? 0 : document.getElementById(targetId).getBoundingClientRect().top + window.scrollY + scrollTop: targetId == '' || !targetObj ? 0 : targetObj.getBoundingClientRect().top + window.scrollY }); }, @@ -481,8 +483,11 @@ NexT.utils = { }); }, - hideCommontes: function () { - document.querySelector('.post-comments').style.display = 'none'; + hideComments: function () { + let postComments = document.querySelector('.post-comments'); + if (postComments !== null) { + postComments.style.display = 'none'; + } }, hiddeLodingCmp: function (selector) { diff --git a/data/config.yaml b/data/config.yaml index 09b516b..f8452e7 100644 --- a/data/config.yaml +++ b/data/config.yaml @@ -1,5 +1,5 @@ # Hugo NexT theme's custom config -version: 4.4.1 +version: 4.5.0 domain: hugo-next.eu.org \ No newline at end of file diff --git a/data/resources.yaml b/data/resources.yaml index 67303ad..5c8c52e 100644 --- a/data/resources.yaml +++ b/data/resources.yaml @@ -129,6 +129,4 @@ plugins: alias_name: '@waline/client' version: 2.13.0 file: dist/comment.js - alias: waline - - + alias: waline \ No newline at end of file diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index d614c01..ca01d80 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -298,11 +298,11 @@ params: # Posts / Categories / Tags in sidebar. basic: true # 站点访问信息 - # Site information - statistic: + # Site's view information + views: enable: true # 组件类型，可选值为： 51la, busuanzi - # 使用51la时需要注册账号：https://invite.51.la/1NUfGTS1?target=V6 + # 使用51la时需要注册账号：https://invite.51.la/ # Plguin value is: 51la, busuanzi plugin: busuanzi @@ -478,6 +478,18 @@ params: categories: true wordCount: true readTime: true + # 是否开启评论数显示 + comments: + enable: true + # 评论统计插件，暂只支持waline + # Comment counter plugin, only support waline + plugin: waline + # 是否开启页面访问数显示 + views: + enable: true + # 页面访问统计插件，支持busuanzi, waline, leancloud + # Page views counter plugin, support: busuanzi, waline, leancloud + plugin: busuanzi # 文章底部的设置 # Post footer settings @@ -937,8 +949,6 @@ params: busuanzi: visitorsIcon: fa fa-user viewsIcon: fa fa-eye - postViews: true - # --------------------------------------------------------------- # 内容搜索服务 diff --git a/exampleSite/content/post/custom-files.md b/exampleSite/content/post/custom-files.md index b491936..c374deb 100644 --- a/exampleSite/content/post/custom-files.md +++ b/exampleSite/content/post/custom-files.md @@ -7,7 +7,8 @@ date: 2022-09-10T21:02:32+08:00 lastmod: 2022-09-10T21:02:32+08:00 categories: - - 示例 + - 示例文章 + tags: - 自定义 - 个性化 diff --git a/exampleSite/content/post/emoji-support.md b/exampleSite/content/post/emoji-support.md index a9dce83..ebe8847 100644 --- a/exampleSite/content/post/emoji-support.md +++ b/exampleSite/content/post/emoji-support.md @@ -7,7 +7,9 @@ date: 2022-06-04T19:46:45+08:00 lastmod: 2022-06-04T19:46:45+08:00 categories: - - 示例 + - 示例文章 + - 语法 + tags: - 表情 - emoji diff --git a/exampleSite/content/post/external-link.md b/exampleSite/content/post/external-link.md index 77fcc7b..cd14bd6 100644 --- a/exampleSite/content/post/external-link.md +++ b/exampleSite/content/post/external-link.md @@ -7,7 +7,7 @@ date: 2022-06-01T15:59:41+08:00 lastmod: 2022-06-01T15:59:41+08:00 categories: - - 示例 + - 示例文章 tags: - Hugo - NexT diff --git a/exampleSite/content/post/hello-world.md b/exampleSite/content/post/hello-world.md index dbf641f..a6e6340 100644 --- a/exampleSite/content/post/hello-world.md +++ b/exampleSite/content/post/hello-world.md @@ -6,10 +6,11 @@ lastmod: 2022-06-03T16:43:23+08:00 date: 2022-06-02T11:52:03+08:00 categories: - - 博客 +- 开始建站 + tags: - - Hugo - - 开始 + - Hugo + - 开始 url: post/hello-world.html toc: true diff --git a/exampleSite/content/post/markdown-syntax.md b/exampleSite/content/post/markdown-syntax.md index 89bf77e..32a4da0 100644 --- a/exampleSite/content/post/markdown-syntax.md +++ b/exampleSite/content/post/markdown-syntax.md @@ -10,7 +10,9 @@ author: Mainroad originLink: https://mainroad-demo.netlify.app/post/basic-elements/ categories: - - 示例 + - 示例文章 + - 语法 + tags: - Markdown - 语法 diff --git a/exampleSite/content/post/math-formula.md b/exampleSite/content/post/math-formula.md index 3a3e965..e0ead99 100644 --- a/exampleSite/content/post/math-formula.md +++ b/exampleSite/content/post/math-formula.md @@ -7,7 +7,8 @@ date: 2022-09-11T10:16:02+08:00 lastmod: 2022-09-11T10:16:02+08:00 categories: - - 示例 + - 第三方引入 + - 数学公式 tags: - 数学公式 - mathjax @@ -32,7 +33,7 @@ math: mathjax {{< /note >}} -**注意：** 使用[支持的TeX功能](https://docs.mathjax.org/en/latest/input/tex/index.html)的联机参考资料。 +**注意：** 使用[支持的TeX功能](https://docs.mathjax.org/en/latest/input/tex/index.html)的联机参考资料。 ## 例子 @@ -50,7 +51,7 @@ $$ ### 几何级数之和 -我把接下来的两个例子分成了几行，这样它在手机上表现得更好。这就是为什么它们包含 `\displaystyle`。 +我把接下来的两个例子分成了几行，这样它在手机上表现得更好。这就是为什么它们包含 `\displaystyle`。或者可使用类似 `\displaylines{x = a + b \\\ y = b + c}` 语法进行截断，具体信息可见：[mathjax-issues2312](https://github.com/mathjax/MathJax/issues/2312) $$ \displaystyle\sum_{i=1}^{k+1}i @@ -78,7 +79,12 @@ $$ ### 乘记号 $$ -\displaystyle 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = \displaystyle \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}, \displaystyle\text{ for }\lvert q\rvert < 1. +\displaystyle 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = +$$ + +$$ +\displaystyle \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}, +\displaystyle\text{ for }\lvert q\rvert < 1. $$ @@ -88,8 +94,8 @@ $$ ### 希腊字母 $$ -\Gamma\ \Delta\ \Theta\ \Lambda\ \Xi\ \Pi\ \Sigma\ \Upsilon\ \Phi\ \Psi\ \Omega -\alpha\ \beta\ \gamma\ \delta\ \epsilon\ \zeta\ \eta\ \theta\ \iota\ \kappa\ \lambda\ \mu\ \nu\ \xi \ \omicron\ \pi\ \rho\ \sigma\ \tau\ \upsilon\ \phi\ \chi\ \psi\ \omega\ \varepsilon\ \vartheta\ \varpi\ \varrho\ \varsigma\ \varphi +\displaylines{\Gamma\ \Delta\ \Theta\ \Lambda\ \Xi\ \Pi\ \Sigma\ \Upsilon\ \Phi\ \Psi\ \Omega +\alpha\ \beta\ \gamma\ \delta\ \epsilon\ \zeta\ \\\\ \eta\ \theta\ \iota\ \kappa\ \lambda\ \mu\ \nu\ \xi \ \omicron\ \pi\ \rho\ \sigma\ \tau\ \upsilon\ \phi\ \chi\ \psi\ \omega\ \varepsilon\ \vartheta\ \varpi\ \varrho\ \varsigma\ \varphi} $$ @@ -99,8 +105,8 @@ $$ $$ $$ -\Leftarrow\ \Rightarrow\ \leftrightarrow\ \Leftrightarrow\ \mapsto\ \hookleftarrow -\leftharpoonup\ \leftharpoondown\ \rightleftharpoons\ \longleftarrow\ \Longleftarrow\ \longrightarrow +\displaylines{\Leftarrow\ \Rightarrow\ \leftrightarrow\ \Leftrightarrow\ \mapsto\ \hookleftarrow +\leftharpoonup\ \leftharpoondown\ \\\\\ \rightleftharpoons\ \longleftarrow\ \Longleftarrow\ \longrightarrow} $$ $$ diff --git a/exampleSite/content/post/mermaid-charts.md b/exampleSite/content/post/mermaid-charts.md index 9f4e44c..1aa92a2 100644 --- a/exampleSite/content/post/mermaid-charts.md +++ b/exampleSite/content/post/mermaid-charts.md @@ -7,7 +7,8 @@ date: 2022-09-18T20:58:13+08:00 lastmod: 2022-09-18T20:58:13+08:00 categories: - - 示例 + - 第三方引入 + - 图序功能 tags: - 流程图 - 时序图 diff --git a/exampleSite/content/post/no-header-title.md b/exampleSite/content/post/no-header-title.md index 7a75e84..f7a6a6c 100644 --- a/exampleSite/content/post/no-header-title.md +++ b/exampleSite/content/post/no-header-title.md @@ -7,7 +7,7 @@ date: 2022-10-06T09:02:26+08:00 lastmod: 2022-10-30T21:03:16+08:00 categories: - - 示例 + - 示例文章 tags: - toc - 标题 diff --git a/exampleSite/content/post/shortcodes.md b/exampleSite/content/post/shortcodes.md index 013cf9c..4cac174 100644 --- a/exampleSite/content/post/shortcodes.md +++ b/exampleSite/content/post/shortcodes.md @@ -7,7 +7,8 @@ date: 2022-08-06T14:41:50+08:00 lastmod: 2022-08-06T14:41:50+08:00 categories: - - 示例 + - 示例文章 + - 语法 tags: - 短代码 - 语法 diff --git a/exampleSite/content/post/syntax-highlighting.md b/exampleSite/content/post/syntax-highlighting.md index e370982..60b94db 100644 --- a/exampleSite/content/post/syntax-highlighting.md +++ b/exampleSite/content/post/syntax-highlighting.md @@ -7,7 +7,8 @@ date: 2022-06-07T19:09:52+08:00 lastmod: 2022-06-07T19:09:52+08:00 categories: - - 示例 + - 示例文章 + - 语法 tags: - 语法 - 高亮 diff --git a/exampleSite/content/post/table-of-content.md b/exampleSite/content/post/table-of-content.md index e31b6d0..039963b 100644 --- a/exampleSite/content/post/table-of-content.md +++ b/exampleSite/content/post/table-of-content.md @@ -7,7 +7,7 @@ date: 2022-06-08T21:12:52+08:00 lastmod: 2022-06-08T21:12:52+08:00 categories: - - 示例 + - 示例文章 tags: - 目录 - 导航 diff --git a/i18n/en.yaml b/i18n/en.yaml index d114344..f851d87 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -18,121 +18,83 @@ CateTitle: AllSome: other: "All {{ .Some }}" -NavToggleLabel: - other: Toggle navigation bar -MSearchLabel: - other: Search +Symbol: + colon: ":" + comma: "," + period: "." -SymbolColon: - other: ":" -SymbolComma: - other: "," -SymbolPeriod: - other: "." +Sidebar: + label: + posts: Posts + categories: Categories + tags: Tags + rss: RSS + ccommons: "Creative Commons" + toc: TOC + overview: Overview + navToggle: "Toggle Navigation Bar" + search: Search -SbPostsLable: - other: "Posts" -SbCatesTitle: - other: "Categories" -SbTagsTitle: - other: "Tags" -TableOfContents: - other: "TOC" -SiteOverview: - other: "Overview" -RSSLable: - other: "RSS Subscribe" -CCLinkTitle: - other: "Creative Commons" +Terms: + archives: "{{ .Count }} posts in total" + categories: "{{ .Count }} categories in total" + tags: "{{ .Count }} tags in total" -TagsCounterTitle: - zero: No tags - other: "{{ .Count }} tags in total" -CatesCounterTitle: - zero: No categories - other: "{{ .Count }} categories in total" -ArchiveCounterTitle: - zero: No posts. - other: "{{ .Count }} posts in total" +PostArchive: + cheers: + um: Um... + ok: Ok + nice: Nice + good: Good + great: Greate + excellent: Excellent + keepOn: Keep on posting.╰(*°▽°*)╯ -PostArchiveCheersUm: - other: Um.. -PostArchiveCheersOk: - other: Ok -PostArchiveCheersNice: - other: Nice -PostArchiveCheersGood: - other: Good -PostArchiveCheersGreat: - other: Great -PostArchiveCheersExcellent: - other: Excellent -PostArchiveKeepOn: - other: Keep on posting.╰(*°▽°*)╯ +PostMeta: + sticky: Stickys + publish: + date: "Publish on" + time: "Create Time" + lastmod: + date: "Update on" + time: "Modify Time" + category: "Classify at" + words: + title: Words + count: "{{- .WordCount -}}" + reading: + title: Read + time: "{{- .ReadingTime -}}mins" + views: Views + comments: Comments + tags: Tags + more: "Read More" + edit: "Edit this post" -PostStickyTitle: - other: Strickys -PostPublishDate: - other: "Publish on" -PostPublishTime: - other: "Create Time" -PostLastModDate: - other: "Update on" -PostLastModTime: - other: "Modify Time" -PostCategory: - other: "Classify at" -PostWords: - other: "Words" -PostWordCount: - other: "{{- .WordCount -}}" -PostReading: - other: "Read" -PostReadTime: - other: "{{- .ReadingTime -}}min" -PostViews: - other: "Views" -PostComments: - other: "Comments" -PostTag: - other: "Tags" -PostReadMore: - other: "Read More" -PostEditTitle: - other: Edit this post +Reward: + title: Donate + wechatpay: WechatPay + alipay: Alipay + paypal: Paypal + bitcoin: Bitcoin -PostCRTitle: - other: Post Title -PostCRAuthor: - other: Post Author -PostCRLink: - other: Post Link -PostCROriginAuthor: - other: Written By -PostCROriginLink: - other: Originally From -PostCRLicenseTitle: - other: Copyright Notice -PostCRLicenseContent: - other: "All articles in this blog are licensed under %s unless stating additionally." +PostCopyRight: + title: Post Title + author: Post Author + link: Post Link + origin: + author: Written By + link: Originally From + license: + title: Copyright Notice + content: "All articles in this blog are licensed under %s unless stating additionally." PostFollowMe: other: Welcome to my other publishing channels -RewardDonate: - other: Donate -RewardWechatpay: - other: Wechat Pay -RewardAlipay: - other: Alipay -RewardPaypal: - other: PayPal -RewardBitcoin: - other: Bitcoin - -PostCommentTitle: - other: Comments +PostComments: + title: Comments SiteInfoItems: title: "Web Status" @@ -147,17 +109,14 @@ SiteInfoItems: totalViews: "Total Views" lastUpdate: "Last Update:" -FooterPowerby: - other: "Power by %s" +Footer: + powerby: "Power by %s" -SearchPh: - other: Searching... -SearchEmpty: - other: "We didn't find any results for the search: ${query}" -SearchHits: +Search: + placeholder: Searching... + empty: "We didn't find any results for the search: ${query}" hits: "${hits} results found" -SearchHitsTime: - other: "${hits} results found in ${time} ms" + time: "${hits} results found in ${time} ms" DateSuffix: years: " Year " diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml index 139470d..639a358 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -19,121 +19,82 @@ CateTitle: AllSome: other: "所有 {{ .Some }}" -NavToggleLabel: - other: 切换导航栏 +Symbol: + colon: "：" + comma: "，" + period: "。" -MSearchLabel: - other: 搜索 +Sidebar: + label: + posts: 日志 + categories: 分类 + tags: 标签 + rss: RSS 订阅 + ccommons: 共享知识 + toc: 文章目录 + overview: 站点概览 + navToggle: 切换导航栏 + search: 搜索 -SymbolColon: - other: "：" -SymbolComma: - other: "，" -SymbolPeriod: - other: "。" - -SbPostsLable: - other: 日志 -SbCatesTitle: - other: 分类 -SbTagsTitle: - other: 标签 -TableOfContents: - other: 文章目录 -SiteOverview: - other: 站点概览 -RSSLable: - other: RSS 订阅 -CCLinkTitle: - other: 共享知识 +Terms: + archives: "目前共计 {{ .Count }} 篇日志" + categories: "目前共计 {{ .Count }} 个分类" + tags: "目前共计 {{ .Count }} 个标签" -TagsCounterTitle: - zero: 暂无标签 - other: "目前共计 {{ .Count }} 个标签" -CatesCounterTitle: - zero: 暂无分类 - other: "目前共计 {{ .Count }} 个分类" -ArchiveCounterTitle: - zero: 暂无日志 - other: "目前共计 {{ .Count }} 篇日志" +PostArchive: + cheers: + um: 嗯.. + ok: 还行 + nice: 不错 + good: 很好 + great: 非常好 + excellent: 太棒了 + keepOn: 继续努力哟。╰(*°▽°*)╯ -PostArchiveCheersUm: - other: 嗯.. -PostArchiveCheersOk: - other: 还行 -PostArchiveCheersNice: - other: 不错 -PostArchiveCheersGood: - other: 很好 -PostArchiveCheersGreat: - other: 非常好 -PostArchiveCheersExcellent: - other: 太棒了 -PostArchiveKeepOn: - other: 继续努力哟。╰(*°▽°*)╯ +PostMeta: + sticky: 置顶 + publish: + date: 发表于 + time: 创建时间 + lastmod: + date: 更新于 + time: 修改时间 + category: 分类于 + words: + title: 字数 + count: "{{- .WordCount -}}" + reading: + title: 阅读 + time: "{{- .ReadingTime -}}分钟" + views: 浏览 + comments: 评论 + tags: 标签 + more: 阅读全文 + edit: 编辑 -PostStickyTitle: - other: 置顶 -PostPublishDate: - other: 发表于 -PostPublishTime: - other: 创建时间 -PostLastModDate: - other: 更新于 -PostLastModTime: - other: 修改时间 -PostCategory: - other: "分类于" -PostWords: - other: 字数 -PostWordCount: - other: "{{- .WordCount -}}" -PostReading: - other: 阅读 -PostReadTime: - other: "{{- .ReadingTime -}}分钟" -PostViews: - other: 浏览 -PostComments: - other: 评论 -PostTags: - other: 标签 -PostReadMore: - other: 阅读全文 -PostEditTitle: - other: 编辑 +Reward: + title: 赞赏 + wechatpay: 微信 + alipay: 支付宝 + paypal: Paypal + bitcoin: 比特币 -PostCRTitle: - other: 文章标题 -PostCRAuthor: - other: 本文作者 -PostCRLink: - other: 本文链接 -PostCROriginAuthor: - other: 原文作者 -PostCROriginLink: - other: 原文链接 -PostCRLicenseTitle: - other: 版权声明 -PostCRLicenseContent: - other: "本博客所有文章除特别声明外，均采用 %s 许可协议。转载请注明出处！" +PostCopyRight: + title: 文章标题 + author: 本文作者 + link: 本文链接 + origin: + author: 原文作者 + link: 原文链接 + license: + title: 版权声明 + content: "本博客所有文章除特别声明外，均采用 %s 许可协议。转载请注明出处！" PostFollowMe: other: 欢迎关注我的其它发布渠道 -RewardDonate: - other: 赞赏 -RewardWechatpay: - other: 微信 -RewardAlipay: - other: 支付宝 -RewardPaypal: - other: PayPal -RewardBitcoin: - other: 比特币 - -PostCommentTitle: - other: 评论交流 +PostComments: + title: 评论交流 SiteInfoItems: title: "网站资讯" @@ -148,17 +109,14 @@ SiteInfoItems: totalViews: "总访问量：" lastUpdate: "最后更新于：" -FooterPowerby: - other: 由 %s 强力驱动 +Footer: + powerby: 由 %s 强力驱动 -SearchPh: - other: 搜索... -SearchEmpty: - other: "没有找到任何搜索结果：${query}" -SearchHits: +Search: + placeholder: 搜索... + empty: "没有找到任何搜索结果：${query}" hits: "找到 ${hits} 个搜索结果" -SearchHitsTime: - other: "找到 ${hits} 个搜索结果（用时 ${time} 毫秒）" + time: "找到 ${hits} 个搜索结果（用时 ${time} 毫秒）" DateSuffix: years: " 年 " diff --git a/i18n/zh-tw.yaml b/i18n/zh-tw.yaml new file mode 100644 index 0000000..9b62961 --- /dev/null +++ b/i18n/zh-tw.yaml @@ -0,0 +1,136 @@ +#-------------------------------------- +# 繁體版本 +#-------------------------------------- + +archives: + other: 文章 +tag: + other: 標籤 +tags: + other: 標籤 +TagTitle: + other: 標籤集錦 +category: + other: 分類 +categories: + other: 分類 +CateTitle: + other: 分類欄目 +AllSome: + other: "所有 {{ .Some }}" + +Symbol: + colon: "：" + comma: "，" + period: "。" + +Sidebar: + label: + posts: 日誌 + categories: 分類 + tags: 標籤 + rss: RSS 訂閱 + ccommons: 共享知識 + toc: 文章目錄 + overview: 站點概覽 + navToggle: 切換導航欄 + search: 搜索 + +Terms: + archives: "目前共計 {{ .Count }} 篇日誌" + categories: "目前共計 {{ .Count }} 個分類" + tags: "目前共計 {{ .Count }} 個標籤" + +PostArchive: + cheers: + um: 嗯.. + ok: 還行 + nice: 不错 + good: 很好 + great: 非常好 + excellent: 太棒了 + keepOn: 繼續努力喲。╰(*°▽°*)╯ + +PostMeta: + sticky: 置頂 + publish: + date: 發表於 + time: 創建時間 + lastmod: + date: 更新於 + time: 修改時間 + category: 分類於 + words: + title: 字數 + count: "{{- .WordCount -}}" + reading: + title: 閱讀 + time: "{{- .ReadingTime -}}分鐘" + views: 瀏覽 + comments: 評論 + tags: 標籤 + more: 閱讀全文 + edit: 編輯 + +Reward: + title: 讚賞 + wechatpay: 微信 + alipay: 支付寶 + paypal: Paypal + bitcoin: 比特幣 + +PostCopyRight: + title: 文章標題 + author: 本文作者 + link: 本文鏈接 + origin: + author: 原文作者 + link: 原文鏈接 + license: + title: 版權聲明 + content: "本博客所有文章除特別聲明外，均採用 %s 許可協議。轉載請註明出處！" + +PostFollowMe: + other: 歡迎關注我的其它發布渠道 + +PostCommentTitle: + other: 評論交流 + +SiteInfoItems: + title: "網站資訊" + runTimes: "已運行：" + words: "總字數：" + readTimes: "閱讀約：" + visitors: "總訪客數：" + pageViews: "頁面瀏覽：" + todayViews: "今日訪問：" + yesterdayViews: "昨日訪問：" + monthViews: "本月訪問：" + totalViews: "總訪問量：" + lastUpdate: "最後更新於：" + +FooterPowerby: + other: 由 %s 強力驅動 + +Search: + placeholder: 搜索... + empty: "沒有找到任何搜索結果：${query}" + hits: "找到 ${hits} 個搜索結果" + time: "找到 ${hits} 個搜索結果（用時 ${time} 毫秒）" + +DateSuffix: + years: " 年 " + days: " 天 " + hours: " 小時 " + mins: " 分鐘" + month: " 個月前" + day: " 天前" + hour: " 小時前" + min: " 分鐘前" + just: "剛剛" + +ToolBtns: + comment: "直達評論" + theme: "深淺模式切換" + lang: "多語言翻譯" + backTop: "返回頂部" \ No newline at end of file diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html new file mode 100644 index 0000000..422e08d --- /dev/null +++ b/layouts/_default/_markup/render-heading.html @@ -0,0 +1,3 @@ +{{ .Text | safeHTML }} + + \ No newline at end of file diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index e4603f8..32bdab5 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,7 +1,7 @@ -{{- $extURL := and .Page.Site.Params.exturl.enable (strings.HasPrefix .Destination "http") }} +{{ $extURL := and .Page.Site.Params.exturl.enable (strings.HasPrefix .Destination "http") }} {{ .Text | safeHTML }} - {{- if and $extURL .Page.Site.Params.exturl.icon }} + {{ if and $extURL .Page.Site.Params.exturl.icon }} - {{- end }} + {{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a83b22c..b4851e7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,13 +1,13 @@ -{{- range $k, $v := (partialCached "init.html" .) -}} -{{- $.Scratch.Set $k $v -}} -{{- end -}} +{{ range $k, $v := (partialCached "init.html" .) }} +{{ $.Scratch.Set $k $v }} +{{ end }} {{ $isComment := .Params.comment.enable | default .Site.Params.comments.enable }} {{ .Scratch.Set "isComment" $isComment }} - {{- partial "head.html" . }} + {{ partial "head.html" . }} {{ block "title" . }}{{ .Site.Title }}{{ end }}