diff --git a/i18n/en.yaml b/i18n/en.yaml index f1a0112..f851d87 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -18,15 +18,11 @@ CateTitle: AllSome: other: "All {{ .Some }}" -MSearchLabel: - other: Search -SymbolColon: - other: ":" -SymbolComma: - other: "," -SymbolPeriod: - other: "." +Symbol: + colon: ":" + comma: "," + period: "." Sidebar: label: @@ -35,34 +31,15 @@ Sidebar: tags: Tags rss: RSS ccommons: "Creative Commons" - navToggle: "Toggle Navigation Bar" toc: TOC overview: Overview - -SbPostsLable: - other: "" -SbCatesTitle: - other: "" -SbTagsTitle: - other: "" -TableOfContents: - other: "TOC" -SiteOverview: - other: "Overview" -RSSLable: - other: "RSS Subscribe" -CCLinkTitle: - other: "Creative Commons" + navToggle: "Toggle Navigation Bar" + search: Search -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" +Terms: + archives: "{{ .Count }} posts in total" + categories: "{{ .Count }} categories in total" + tags: "{{ .Count }} tags in total" PostArchive: cheers: @@ -116,8 +93,8 @@ PostCopyRight: PostFollowMe: other: Welcome to my other publishing channels -PostCommentTitle: - other: Comments +PostComments: + title: Comments SiteInfoItems: title: "Web Status" @@ -132,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 cd47579..639a358 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -19,18 +19,10 @@ CateTitle: AllSome: other: "所有 {{ .Some }}" -NavToggleLabel: - other: 切换导航栏 - -MSearchLabel: - other: 搜索 - -SymbolColon: - other: "：" -SymbolComma: - other: "，" -SymbolPeriod: - other: "。" +Symbol: + colon: "：" + comma: "，" + period: "。" Sidebar: label: @@ -44,15 +36,10 @@ Sidebar: navToggle: 切换导航栏 search: 搜索 -TagsCounterTitle: - zero: 暂无标签 - other: "目前共计 {{ .Count }} 个标签" -CatesCounterTitle: - zero: 暂无分类 - other: "目前共计 {{ .Count }} 个分类" -ArchiveCounterTitle: - zero: 暂无日志 - other: "目前共计 {{ .Count }} 篇日志" +Terms: + archives: "目前共计 {{ .Count }} 篇日志" + categories: "目前共计 {{ .Count }} 个分类" + tags: "目前共计 {{ .Count }} 个标签" PostArchive: cheers: @@ -106,8 +93,8 @@ PostCopyRight: PostFollowMe: other: 欢迎关注我的其它发布渠道 -PostCommentTitle: - other: 评论交流 +PostComments: + title: 评论交流 SiteInfoItems: title: "网站资讯" @@ -122,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/layouts/_default/terms.html b/layouts/_default/terms.html index 5dddd08..734f41c 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -36,7 +36,7 @@ {{ $tags := .Site.Taxonomies.tags }}
- {{ T "TagsCounterTitle" (.Scratch.Get "tagsCount") | safeHTML }} + {{ T "Terms.tags" (.Scratch.Get "tagsCount") | safeHTML }}
{{ $randNums := (seq 10) }} diff --git a/layouts/archives/section.html b/layouts/archives/section.html index 063d059..a6fef09 100644 --- a/layouts/archives/section.html +++ b/layouts/archives/section.html @@ -21,9 +21,9 @@ {{ end }} {{ T (printf "PostArchive.cheers.%s" $cheers) }} - {{ T "SymbolComma" }} - {{ T "ArchiveCounterTitle" $posts | safeHTML }} - {{ T "SymbolComma" }} + {{ T "Symbol.comma" }} + {{ T "Terms.archives" $posts | safeHTML }} + {{ T "Symbol.comma" }} {{ T "PostArchive.keepOn" }}
diff --git a/layouts/partials/_thirdparty/search/local.html b/layouts/partials/_thirdparty/search/local.html index d67006a..3565034 100644 --- a/layouts/partials/_thirdparty/search/local.html +++ b/layouts/partials/_thirdparty/search/local.html @@ -4,7 +4,7 @@
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index b24b1c1..f9a368f 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -9,7 +9,7 @@
- {{ T "PostCommentTitle" }} + {{ T "PostComments.title" }}
{{ if $tc }} {{ $sn = (sort .nav "weight") }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 4b58581..8ed63b2 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -27,7 +27,7 @@ {{ if $ft.powered }}
{{ $pb := printf "Hugo & Hugo NexT.%s" hugo.Version .Site.Data.config.version .Site.Params.scheme }} - {{ printf (T "FooterPowerby") $pb | safeHTML }} + {{ printf (T "Footer.powerby") $pb | safeHTML }}
{{ end }} {{ with $ft.beian }} diff --git a/layouts/partials/init.html b/layouts/partials/init.html index 68e54e6..d2576a9 100644 --- a/layouts/partials/init.html +++ b/layouts/partials/init.html @@ -37,10 +37,10 @@ "lazyload" .Site.Params.lazyload "motion" .Site.Params.motion "i18n" (dict - "placeholder" (T "SearchPh") - "empty" (T "SearchEmpty") - "hits_time" (T "SearchHitsTime") - "hits" (T "SearchHits") + "placeholder" (T "Search.placeholder") + "empty" (T "Search.empty") + "hits_time" (T "Search.time") + "hits" (T "Search.hits") "ds_years" (T "DateSuffix.years") "ds_days" (T "DateSuffix.days") "ds_hours" (T "DateSuffix.hours") diff --git a/layouts/partials/post/footer_meta/copyright.html b/layouts/partials/post/footer_meta/copyright.html index bd949d5..13274b6 100644 --- a/layouts/partials/post/footer_meta/copyright.html +++ b/layouts/partials/post/footer_meta/copyright.html @@ -3,29 +3,29 @@ {{ T
  • - {{ print (T "PostCopyRight.title") (T "SymbolColon") }} + {{ print (T "PostCopyRight.title") (T "Symbol.colon") }} {{ .Title }}
  • {{ if isset .Params "author" }} - {{ print (T "PostCopyRight.origin.author") (T "SymbolColon") }} + {{ print (T "PostCopyRight.origin.author") (T "Symbol.colon") }} {{ .Params.Author }} {{ else }} - {{ print (T "PostCopyRight.author") (T "SymbolColon") }} + {{ print (T "PostCopyRight.author") (T "Symbol.colon") }} {{ .Site.Params.author }} {{ end }}
  • {{ if isset .Params "link" }} - {{ print (T "PostCopyRight.origin.link") (T "SymbolColon") }} + {{ print (T "PostCopyRight.origin.link") (T "Symbol.colon") }} {{ .Params.Link }} {{ else }} - {{ print (T "PostCopyRight.link") (T "SymbolColon") }} + {{ print (T "PostCopyRight.link") (T "Symbol.colon") }} {{ .Permalink | absLangURL }} {{ end }}
  • - {{ print (T "PostCopyRight.license.title") (T "SymbolColon") }} + {{ print (T "PostCopyRight.license.title") (T "Symbol.colon") }} {{ $ccText := .Site.Params.creativeCommons.license | upper }} {{ $ccLink := printf "%s" (substr .Site.LanguageCode 0 2) $ccText }} {{ printf (T "PostCopyRight.license.content") $ccLink | safeHTML }} diff --git a/layouts/partials/post/header_meta/categories.html b/layouts/partials/post/header_meta/categories.html index 5682800..339d06f 100644 --- a/layouts/partials/post/header_meta/categories.html +++ b/layouts/partials/post/header_meta/categories.html @@ -5,7 +5,7 @@ - {{ print (T "PostMeta.category") (T "SymbolColon") }} + {{ print (T "PostMeta.category") (T "Symbol.colon") }} {{ range (first 1 .) }} diff --git a/layouts/partials/post/header_meta/comments.html b/layouts/partials/post/header_meta/comments.html index bc0b345..fd8ee56 100644 --- a/layouts/partials/post/header_meta/comments.html +++ b/layouts/partials/post/header_meta/comments.html @@ -3,7 +3,7 @@ - {{ print (T "PostMeta.comments") (T "SymbolColon") }} + {{ print (T "PostMeta.comments") (T "Symbol.colon") }} diff --git a/layouts/partials/post/header_meta/created_date.html b/layouts/partials/post/header_meta/created_date.html index 64ce274..8e4a8b3 100644 --- a/layouts/partials/post/header_meta/created_date.html +++ b/layouts/partials/post/header_meta/created_date.html @@ -6,9 +6,9 @@ - {{ print (T "PostMeta.publish.date") (T "SymbolColon") }} + {{ print (T "PostMeta.publish.date") (T "Symbol.colon") }} -